Merge branch 'develop' into feat/change-to-overflow-auto

Author: shivani170

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.4.9-beta-1",
+    "version": "1.5.2-beta-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -23,6 +23,7 @@ import { configureMonacoYaml } from 'monaco-yaml'
 import { ReactComponent as ICWarningY5 } from '@Icons/ic-warning-y5.svg'
 import { ReactComponent as Info } from '../../Assets/Icon/ic-info-filled.svg'
 import { ReactComponent as ErrorIcon } from '../../Assets/Icon/ic-error-exclamation.svg'
+import { ReactComponent as ICCompare } from '@Icons/ic-compare.svg'
 import './codeEditor.scss'
 import 'monaco-editor'
 
@@ -491,7 +492,7 @@ const SplitPane = ({}) => {
     }
     return (
         <div className="code-editor__split-pane flex pointer" onClick={handleToggle}>
-            <div className="diff-icon" />
+            <ICCompare className="icon-dim-20 mr-4" />
             {state.diffMode ? 'Hide comparison' : 'Compare with default'}
         </div>
     )

src/Assets/Img/delete-medium.svg

@@ -121,13 +121,6 @@
     color: var(--N0);
 }
 
-.diff-icon {
-    height: 20px;
-    width: 20px;
-    margin-right: 4px;
-    background: url('../../Assets/Icon/ic-compare.svg');
-}
-
 .monaco-editor-hover {
     margin-left: 40px;
 }

src/Assets/Img/ic-not-authorized.svg

@@ -116,11 +116,17 @@
             .mde-preview-content {
                 padding: 0px !important;
 
-                a.anchor {
-                    color: var(--N900);
+                a {
+                    color: var(--B500);
 
-                    h1, h2, h3 {
-                        border-bottom: 1px solid var(--N200);
+                    &.anchor {
+                        color: var(--N900);
+
+                        h1,
+                        h2,
+                        h3 {
+                            border-bottom: 1px solid var(--N200);
+                        }
                     }
                 }
 

src/Assets/Img/ic-not-found.svg

@@ -45,11 +45,11 @@ import {
     WebhookEventNameType,
 } from '../Shared'
 import { ReactComponent as ArrowDown } from '@Icons/ic-chevron-down.svg'
-import webhookIcon from '@Icons/ic-webhook.svg'
-import branchIcon from '@Icons/ic-branch.svg'
-import regexIcon from '@Icons/ic-regex.svg'
-import pullRequest from '@Icons/ic-pull-request.svg'
-import tagIcon from '@Icons/ic-tag.svg'
+import { ReactComponent as ICWebhook } from '@Icons/ic-webhook.svg'
+import { ReactComponent as ICBranch } from '@Icons/ic-branch.svg'
+import { ReactComponent as ICRegex } from '@Icons/ic-regex.svg'
+import { ReactComponent as ICPullRequest } from '@Icons/ic-pull-request.svg'
+import { ReactComponent as ICTag } from '@Icons/ic-tag.svg'
 import { SourceTypeMap } from '@Common/Common.service'
 import { getIsRequestAborted } from './Api'
 
@@ -990,17 +990,17 @@ export const throttle = <T extends (...args: unknown[]) => unknown>(
 export const getBranchIcon = (sourceType, _isRegex?: boolean, webhookEventName?: string) => {
     if (sourceType === SourceTypeMap.WEBHOOK) {
         if (webhookEventName === WebhookEventNameType.PULL_REQUEST) {
-            return pullRequest
+            return <ICPullRequest className="scn-6" />
         }
         if (webhookEventName === WebhookEventNameType.TAG_CREATION) {
-            return tagIcon
+        return <ICTag className="scn-6" />
         }
-        return webhookIcon
+        return <ICWebhook />
     }
     if (sourceType === SourceTypeMap.BranchRegex || _isRegex) {
-        return regexIcon
+        return <ICRegex className="fcn-6" />
     }
-    return branchIcon
+    return <ICBranch className="fcn-6" />
 }
 
 // TODO: Might need to expose sandbox and referrer policy