From 737442e26ad9c33169a94113010860fde9cb0993 Mon Sep 17 00:00:00 2001 From: Kristi Date: Sat, 13 Aug 2022 20:31:47 -0400 Subject: [PATCH] Update merge editor colors --- themes/tokyo-night-color-theme.json | 12 ++++++++++-- themes/tokyo-night-light-color-theme.json | 10 +++++++++- themes/tokyo-night-storm-color-theme.json | 12 ++++++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json index 5bc30b9..3e62465 100644 --- a/themes/tokyo-night-color-theme.json +++ b/themes/tokyo-night-color-theme.json @@ -359,7 +359,7 @@ "gitDecoration.renamedResourceForeground": "#449dab", "gitDecoration.addedResourceForeground": "#449dab", "gitDecoration.untrackedResourceForeground": "#449dab", - "gitDecoration.conflictingResourceForeground": "#bb7a61", + "gitDecoration.conflictingResourceForeground": "#e0af68", "gitDecoration.stageDeletedResourceForeground": "#914c54", "gitDecoration.stageModifiedResourceForeground": "#6183bb", @@ -378,10 +378,18 @@ "charts.foreground": "#9AA5CE", "charts.lines": "#16161e", - "merge.currentHeaderBackground": "#007a75aa", + "merge.currentHeaderBackground": "#41a6b525", "merge.currentContentBackground": "#007a7544", "merge.incomingHeaderBackground": "#3d59a1aa", "merge.incomingContentBackground": "#3d59a144", + "mergeEditor.change.background": "#41a6b525", + "mergeEditor.change.word.background": "#41a6b540", + "mergeEditor.conflict.unhandledUnfocused.border": "#e0af6888", + "mergeEditor.conflict.unhandledFocused.border": "#e0af68b0", + "mergeEditor.conflict.handledUnfocused.border": "#41a6b525", + "mergeEditor.conflict.handledFocused.border": "#41a6b565", + "mergeEditor.conflict.handled.minimapOverViewRuler": "#449dab", + "mergeEditor.conflict.unhandled.minimapOverViewRuler": "#e0af68", "gitlens.trailingLineForegroundColor": "#444b6a", "gitlens.gutterUncommittedForegroundColor": "#444b6a", diff --git a/themes/tokyo-night-light-color-theme.json b/themes/tokyo-night-light-color-theme.json index f50c2e7..efe126f 100644 --- a/themes/tokyo-night-light-color-theme.json +++ b/themes/tokyo-night-light-color-theme.json @@ -365,7 +365,7 @@ "gitDecoration.renamedResourceForeground": "#166775", "gitDecoration.addedResourceForeground": "#166775", "gitDecoration.untrackedResourceForeground": "#166775", - "gitDecoration.conflictingResourceForeground": "#bb7a61", + "gitDecoration.conflictingResourceForeground": "#8f5e15", "gitDecoration.stageDeletedResourceForeground": "#914c54", "gitDecoration.stageModifiedResourceForeground": "#34548a", @@ -388,6 +388,14 @@ "merge.currentContentBackground": "#007a7544", "merge.incomingHeaderBackground": "#34548aaa", "merge.incomingContentBackground": "#34548a44", + "mergeEditor.change.background": "#007a7522", + "mergeEditor.change.word.background": "#007a7522", + "mergeEditor.conflict.unhandledUnfocused.border": "#bb7a6188", + "mergeEditor.conflict.unhandledFocused.border": "#bb7a61", + "mergeEditor.conflict.handledUnfocused.border": "#007a7525", + "mergeEditor.conflict.handledFocused.border": "#007a7525", + "mergeEditor.conflict.handled.minimapOverViewRuler": "#007a75", + "mergeEditor.conflict.unhandled.minimapOverViewRuler": "#bb7a61", "gitlens.trailingLineForegroundColor": "#868891", "gitlens.gutterUncommittedForegroundColor": "#868891", diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json index 71fa5d2..48247f5 100644 --- a/themes/tokyo-night-storm-color-theme.json +++ b/themes/tokyo-night-storm-color-theme.json @@ -358,7 +358,7 @@ "gitDecoration.renamedResourceForeground": "#449dab", "gitDecoration.addedResourceForeground": "#449dab", "gitDecoration.untrackedResourceForeground": "#449dab", - "gitDecoration.conflictingResourceForeground": "#bb7a61", + "gitDecoration.conflictingResourceForeground": "#e0af68", "gitDecoration.stageDeletedResourceForeground": "#914c54", "gitDecoration.stageModifiedResourceForeground": "#6183bb", @@ -377,10 +377,18 @@ "charts.foreground": "#9AA5CE", "charts.lines": "#1f2335", - "merge.currentHeaderBackground": "#007a75aa", + "merge.currentHeaderBackground": "#41a6b525", "merge.currentContentBackground": "#007a7544", "merge.incomingHeaderBackground": "#3d59a1aa", "merge.incomingContentBackground": "#3d59a144", + "mergeEditor.change.background": "#41a6b525", + "mergeEditor.change.word.background": "#41a6b540", + "mergeEditor.conflict.unhandledUnfocused.border": "#e0af6888", + "mergeEditor.conflict.unhandledFocused.border": "#e0af68d9", + "mergeEditor.conflict.handledUnfocused.border": "#41a6b525", + "mergeEditor.conflict.handledFocused.border": "#41a6b565", + "mergeEditor.conflict.handled.minimapOverViewRuler": "#449dab", + "mergeEditor.conflict.unhandled.minimapOverViewRuler": "#e0af68", "gitlens.trailingLineForegroundColor": "#565f89", "gitlens.gutterUncommittedForegroundColor": "#565f89",