Skip to content

Commit

Permalink
👌 IMPROVE: Merge Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahmadawais
ahmadawais committed Mar 14, 2024
1 parent 73602b5 commit cbbbe80
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 19 deletions.
15 changes: 8 additions & 7 deletions themes/shades-of-purple-color-theme-italic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,14 @@
"list.inactiveSelectionForeground": "#AAA",

// Merge Conflicts.
"merge.border": "#FFFFFF00",
"merge.commonContentBackground": "#FFFFFF00",
"merge.commonHeaderBackground": "#FFFFFF00",
"merge.currentContentBackground": "#FFFFFF00",
"merge.currentHeaderBackground": "#FFFFFF00",
"merge.incomingContentBackground": "#FFFFFF00",
"merge.incomingHeaderBackground": "#FFFFFF00",
"merge.currentHeaderBackground": "#3AD90050",
"merge.currentContentBackground": "#3AD90050",
"merge.incomingHeaderBackground": "#A599E950",
"merge.incomingContentBackground": "#A599E950",
// "merge.commonContentBackground": "#A599E981",
// "merge.commonHeaderBackground": "#A599E981",
// "merge.incomingContentBackground": "#ff730086",
// "merge.incomingHeaderBackground": "#ff730086",

// Notification Colors.
"notificationCenter.border": "#1E1E3F", // Notification Center border color.
Expand Down
15 changes: 8 additions & 7 deletions themes/shades-of-purple-color-theme-super-dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,14 @@
"list.inactiveSelectionForeground": "#AAA",

// Merge Conflicts.
"merge.border": "#FFFFFF00",
"merge.commonContentBackground": "#A599E981",
"merge.commonHeaderBackground": "#A599E981",
"merge.currentContentBackground": "#3ad90093",
"merge.currentHeaderBackground": "#3ad90093",
"merge.incomingContentBackground": "#ff730086",
"merge.incomingHeaderBackground": "#ff730086",
"merge.currentHeaderBackground": "#3AD90070",
"merge.currentContentBackground": "#3AD90070",
"merge.incomingHeaderBackground": "#A599E970",
"merge.incomingContentBackground": "#A599E970",
// "merge.commonContentBackground": "#A599E981",
// "merge.commonHeaderBackground": "#A599E981",
// "merge.incomingContentBackground": "#ff730086",
// "merge.incomingHeaderBackground": "#ff730086",

// Notification Colors.
"notificationCenter.border": "#15152b", // Notification Center border color.
Expand Down
11 changes: 6 additions & 5 deletions themes/shades-of-purple-color-theme.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,12 @@
"list.inactiveSelectionForeground": "#AAA",

// Merge Conflicts.
"merge.border": "#FFFFFF00",
"merge.commonContentBackground": "#A599E981",
"merge.commonHeaderBackground": "#A599E981",
"merge.currentContentBackground": "#3ad90093",
"merge.currentHeaderBackground": "#3ad90093",
"merge.currentHeaderBackground": "#3AD90050",
"merge.currentContentBackground": "#3AD90050",
"merge.incomingHeaderBackground": "#A599E950",
"merge.incomingContentBackground": "#A599E950",
// "merge.commonContentBackground": "#A599E981",
// "merge.commonHeaderBackground": "#A599E981",
// "merge.incomingContentBackground": "#ff730086",
// "merge.incomingHeaderBackground": "#ff730086",

Expand Down

0 comments on commit cbbbe80

Please sign in to comment.