improve merge conflict decorations

eenaree · Oct 28, 2023 · 0c8ba13 · 0c8ba13
1 parent 26f04d2
commit 0c8ba13
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/themes/new_darcula.json b/themes/new_darcula.json
@@ -232,6 +232,10 @@
     "merge.currentContentBackground": "#294436",
     "merge.incomingHeaderBackground": "#43698d",
     "merge.incomingContentBackground": "#385570",
+    "editorOverviewRuler.currentContentForeground": "#447152",
+    "editorOverviewRuler.incomingContentForeground": "#43698d",
+    "mergeEditor.change.background": "#352d2b",
+    "mergeEditor.change.word.background": "#45302b",
 
     "textLink.foreground": "#589DF6",
     "textLink.activeForeground": "#57C7FE",

diff --git a/themes/new_dark.json b/themes/new_dark.json
@@ -235,6 +235,10 @@
     "merge.currentContentBackground": "#294436",
     "merge.incomingHeaderBackground": "#43698d",
     "merge.incomingContentBackground": "#385570",
+    "editorOverviewRuler.currentContentForeground": "#437151",
+    "editorOverviewRuler.incomingContentForeground": "#43698d",
+    "mergeEditor.change.background": "#2e2626",
+    "mergeEditor.change.word.background": "#45302b",
 
     "textLink.foreground": "#6a9bfa",
     "textLink.activeForeground": "#538af6",

diff --git a/themes/new_light.json b/themes/new_light.json
@@ -235,6 +235,10 @@
     "merge.currentContentBackground": "#bee6be",
     "merge.incomingHeaderBackground": "#e6effa",
     "merge.incomingContentBackground": "#c2d8f2",
+    "editorOverviewRuler.currentContentForeground": "#aadfa9",
+    "editorOverviewRuler.incomingContentForeground": "#b6d2f2",
+    "mergeEditor.change.background": "#ffeeeb",
+    "mergeEditor.change.word.background": "#ffd5cc",
 
     "textLink.foreground": "#315fbd",
     "textLink.activeForeground": "#3474f0",

diff --git a/themes/new_light_with_darkHeader.json b/themes/new_light_with_darkHeader.json
@@ -239,6 +239,10 @@
     "merge.currentContentBackground": "#bee6be",
     "merge.incomingHeaderBackground": "#e6effa",
     "merge.incomingContentBackground": "#c2d8f2",
+    "editorOverviewRuler.currentContentForeground": "#aadfa9",
+    "editorOverviewRuler.incomingContentForeground": "#b6d2f2",
+    "mergeEditor.change.background": "#ffeeeb",
+    "mergeEditor.change.word.background": "#ffd5cc",
 
     "textLink.foreground": "#315fbd",
     "textLink.activeForeground": "#3474f0",