Merge pull request #1554 from devtron-labs/custom-input-bugfixes

fix: Label for webhook token

Author: shivani170

src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

@@ -361,18 +361,16 @@ export function WebhookDetailsModal({ close }: WebhookDetailType) {
 
     const renderWebhookURLTokenContainer = (): JSX.Element => {
         return (
-            <div className="mb-16">
-                <div className="flexbox w-100 dc__position-rel en-2 bw-1 br-4 h-32">
-                    <CustomInput
-                        name="api-token"
-                        label={renderWebhhokTokenLabel()}
-                        placeholder="Enter API token"
-                        rootClassName="bcn-0 dc__no-border"
-                        onChange={handleTokenChange}
-                        value={tryoutAPIToken} 
-                        error={showTryoutAPITokenError && WEBHOOK_NO_API_TOKEN_ERROR}
-                    />
-                </div>
+            <div className="flexbox w-100 dc__position-rel en-2 bw-1 br-4 h-32 mb-16">
+                {renderWebhhokTokenLabel()}
+                <CustomInput
+                    name="api-token"
+                    placeholder="Enter API token"
+                    rootClassName="bcn-0 dc__no-border-imp w-100 h-32 pt-5-imp p-0-8-imp"
+                    onChange={handleTokenChange}
+                    value={tryoutAPIToken}
+                    error={showTryoutAPITokenError && WEBHOOK_NO_API_TOKEN_ERROR}
+                />
             </div>
         )
     }

src/components/deploymentGroups/BulkActionEdit.tsx

@@ -400,7 +400,7 @@ function TitledCard({ number, completed = false, title, next, onClick, children
             <div className={`title-container ${completed ? 'active' : ''}`}>
                 <div className="index flex">{number}</div>
                 <div className="title flex left cn-9">{title}</div>
-                <div className="next flex">{completed && typeof next === 'function' && <button className="cta" onClick={next} type="button">Next</button>}</div>
+                <div className="next flex">{completed && typeof next === 'function' && <button className="cta flex" onClick={next} type="button">Next</button>}</div>
             </div>
             {children}
         </div>

src/components/material/MaterialView.tsx

@@ -395,9 +395,9 @@ export class MaterialView extends Component<MaterialViewProps, MaterialViewState
 
     renderGitRepoUrlLabel = (): JSX.Element => {
         return (
-            <label className="form__label">
+            <>
                 Git Repo URL<span className="cr-5">* </span>(use {this.gitAuthType('host')})
-            </label>
+            </>
         )
     }
 

src/css/base.scss

@@ -3421,6 +3421,10 @@ textarea,
     padding: 6px 12px !important;
 }
 
+.p-0-8-imp {
+    padding: 0px 8px !important;
+}
+
 // Margin in pixels
 .dc__m-auto {
     margin: auto;