tokyo-night/vscode
0
0
Fork 0
mirror of https://github.com/enkia/tokyo-night-vscode-theme.git synced 2024-11-07 20:24:11 -05:00
Code Activity

Update merge editor colors

Browse source
This commit is contained in:
Kristi 2022-08-13 20:31:47 -04:00
parent e8c144b548
commit 737442e26a
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
themes/tokyo-night-color-theme.json
View file

@ -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",

10
themes/tokyo-night-light-color-theme.json
View file

@ -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",

12
themes/tokyo-night-storm-color-theme.json
View file

@ -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",