style: CodeMirror - update styles

Author: RohitRaj011

src/Common/CodeMirror/CodeEditor.theme.ts

@@ -22,16 +22,42 @@ export const getCodeEditorTheme = (isDark: boolean) => {
     const themeInit = isDark ? githubDarkInit : githubLightInit
     const styles = isDark
         ? [
-              { tag: [t.className, t.propertyName], color: 'var(--code-editor-property-name)' },
-              { tag: [t.variableName, t.attributeName, t.number, t.operator], color: 'var(--code-editor-number)' },
-              { tag: [t.heading, t.strong], color: 'var(--code-editor-property-name)', fontWeight: 'bold' },
-              { tag: [t.emphasis], color: 'var(--code-editor-property-name)', fontStyle: 'italic' },
-              { tag: [t.atom, t.bool, t.special(t.variableName)], color: 'var(--code-editor-boolean)' },
+              {
+                  tag: [t.className, t.propertyName],
+                  color: 'var(--code-editor-property-name)',
+              },
+              {
+                  tag: [t.variableName, t.attributeName, t.number, t.operator],
+                  color: 'var(--code-editor-number)',
+              },
+              {
+                  tag: [t.heading, t.strong],
+                  color: 'var(--code-editor-property-name)',
+                  fontWeight: 'bold',
+              },
+              {
+                  tag: [t.emphasis],
+                  color: 'var(--code-editor-property-name)',
+                  fontStyle: 'italic',
+              },
+              {
+                  tag: [t.atom, t.bool, t.special(t.variableName)],
+                  color: 'var(--code-editor-boolean)',
+              },
           ]
         : [
-              { tag: [t.className, t.propertyName], color: 'var(--code-editor-property-name)' },
-              { tag: [t.variableName, t.attributeName, t.number, t.operator], color: 'var(--code-editor-number)' },
-              { tag: [t.atom, t.bool, t.special(t.variableName)], color: 'var(--code-editor-boolean)' },
+              {
+                  tag: [t.className, t.propertyName],
+                  color: 'var(--code-editor-property-name)',
+              },
+              {
+                  tag: [t.variableName, t.attributeName, t.number, t.operator],
+                  color: 'var(--code-editor-number)',
+              },
+              {
+                  tag: [t.atom, t.bool, t.special(t.variableName)],
+                  color: 'var(--code-editor-boolean)',
+              },
           ]
 
     return {

src/Common/CodeMirror/codeEditor.scss

@@ -60,6 +60,11 @@
     .cm-deletedChunk .cm-deletedText {
         background: var(--bg-code-editor-red-highlight);
         border-radius: 4px;
+        padding: 0 2px;
+        color: var(--N900);
+        > span {
+            color: var(--N900);
+        }
     }
 
     &.cm-merge-a .cm-changedLineGutter {
@@ -73,6 +78,11 @@
     &.cm-merge-b .cm-changedText {
         background: var(--bg-code-editor-green-highlight);
         border-radius: 4px;
+        padding: 0 2px;
+        color: var(--N900);
+        > span {
+            color: var(--N900);
+        }
     }
 
     &.cm-merge-b .cm-changedLineGutter {