From cbbbe8069469e20266da574237cae19ae01dd2aa Mon Sep 17 00:00:00 2001 From: Ahmad Awais Date: Wed, 13 Mar 2024 23:00:27 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Merge=20Conflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/shades-of-purple-color-theme-italic.json | 15 ++++++++------- .../shades-of-purple-color-theme-super-dark.json | 15 ++++++++------- themes/shades-of-purple-color-theme.json | 11 ++++++----- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/themes/shades-of-purple-color-theme-italic.json b/themes/shades-of-purple-color-theme-italic.json index 0585852..04ffb30 100644 --- a/themes/shades-of-purple-color-theme-italic.json +++ b/themes/shades-of-purple-color-theme-italic.json @@ -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. diff --git a/themes/shades-of-purple-color-theme-super-dark.json b/themes/shades-of-purple-color-theme-super-dark.json index 4c27e53..bae93c6 100644 --- a/themes/shades-of-purple-color-theme-super-dark.json +++ b/themes/shades-of-purple-color-theme-super-dark.json @@ -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. diff --git a/themes/shades-of-purple-color-theme.json b/themes/shades-of-purple-color-theme.json index aee196d..b15cc6c 100644 --- a/themes/shades-of-purple-color-theme.json +++ b/themes/shades-of-purple-color-theme.json @@ -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",