feat: improve colours for merge editor

robertrossmann · Sep 5, 2022 · 9834593 · 9834593
1 parent 47aa27e
commit 9834593
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/generators/mkui.ts b/src/generators/mkui.ts
@@ -460,16 +460,16 @@ function mkui({ ui, code }: mkuiParams): UIColourPalette {
     /**
      * Merge Conflicts
      */
-    'merge.currentHeaderBackground': ui.scm.conflicts.current.alpha(ch(0x22)).hexa(),
-    'merge.incomingHeaderBackground': ui.scm.conflicts.incoming.alpha(ch(0x22)).hexa(),
-    'merge.commonHeaderBackground': ui.scm.conflicts.common.alpha(ch(0x22)).hexa(),
     'merge.border': ui.border.alpha(ch(0x99)).hexa(),
+    'merge.commonContentBackground': ui.scm.conflicts.common.alpha(ch(0x11)).hexa(),
+    'merge.commonHeaderBackground': ui.scm.conflicts.common.alpha(ch(0x33)).hexa(),
+    'merge.currentContentBackground': ui.scm.conflicts.current.alpha(ch(0x11)).hexa(),
+    'merge.currentHeaderBackground': ui.scm.conflicts.current.alpha(ch(0x33)).hexa(),
+    'merge.incomingContentBackground': ui.scm.conflicts.incoming.alpha(ch(0x11)).hexa(),
+    'merge.incomingHeaderBackground': ui.scm.conflicts.incoming.alpha(ch(0x33)).hexa(),
     // 'editorOverviewRuler.currentContentForeground': '#FF0000',
     // 'editorOverviewRuler.incomingContentForeground': '#FF0000',
     // 'editorOverviewRuler.commonContentForeground': '#FF0000',
-    // 'merge.commonContentBackground': '#FF0000',
-    // 'merge.currentContentBackground': '#FF0000',
-    // 'merge.incomingContentBackground': '#FF0000',
 
     /**
      * Panel Colours