From 31df2682c6998515471c14d9c0f1792a8c7cce31 Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Tue, 14 Jul 2020 13:57:23 +0200 Subject: Minor improvements - use orginal yaru green badges - use a light terminal to reduce the heavy contrast against the bright window --- themes/light/yaru.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'themes') diff --git a/themes/light/yaru.json b/themes/light/yaru.json index 7198802..5497345 100644 --- a/themes/light/yaru.json +++ b/themes/light/yaru.json @@ -356,9 +356,9 @@ "list.inactiveSelectionBackground": "#e4e4e4", "activityBar.background": "#e4e4e4", "activityBar.dropBackground": "#e9542080", - "activityBarBadge.background": "#e95420", + "activityBarBadge.background": "#0e8420", "activityBarBadge.foreground": "#ffffff", - "badge.background": "#e95420", + "badge.background": "#0e8420", "badge.foreground": "#ffffff", "sideBar.background": "#f6f6f6", "sideBarSectionHeader.background": "#e4e4e4", @@ -430,8 +430,8 @@ "menubar.selectionForeground": "#111111", "statusBar.foreground": "#111111", "tab.unfocusedInactiveBackground": "#edeef0", - "terminal.background": "#300a24", - "terminal.foreground": "#FFFFFF", + "terminal.background": "#f7f7f7", + "terminal.foreground": "#3b3b3b", "titleBar.activeForeground": "#c0c0c0", "titleBar.inactiveBackground": "#3d3a3a", "titleBar.inactiveForeground": "#959697" -- cgit v1.2.3 From 9e45977ab84cf6911ec2add563bf806af84b18b9 Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Wed, 15 Jul 2020 10:00:50 +0200 Subject: Further adaptions - revert yaru light terminal colors back to white on purple - exactly use the correct greens for light and dark yaru themes --- themes/dark/yaru-dark.json | 4 ++-- themes/light/yaru.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'themes') diff --git a/themes/dark/yaru-dark.json b/themes/dark/yaru-dark.json index d28fd5e..acc587f 100644 --- a/themes/dark/yaru-dark.json +++ b/themes/dark/yaru-dark.json @@ -356,9 +356,9 @@ "list.inactiveSelectionBackground": "#575757", "activityBar.background": "#575757", "activityBar.dropBackground": "#e9542080", - "activityBarBadge.background": "#e95420", + "activityBarBadge.background": "#0c6d1a", "activityBarBadge.foreground": "#ffffff", - "badge.background": "#e95420", + "badge.background": "#0c6d1a", "badge.foreground": "#ffffff", "sideBar.background": "#3f3f3f", "sideBarSectionHeader.background": "#575757", diff --git a/themes/light/yaru.json b/themes/light/yaru.json index 5497345..dedd07c 100644 --- a/themes/light/yaru.json +++ b/themes/light/yaru.json @@ -356,9 +356,9 @@ "list.inactiveSelectionBackground": "#e4e4e4", "activityBar.background": "#e4e4e4", "activityBar.dropBackground": "#e9542080", - "activityBarBadge.background": "#0e8420", + "activityBarBadge.background": "#109a26", "activityBarBadge.foreground": "#ffffff", - "badge.background": "#0e8420", + "badge.background": "#109a26", "badge.foreground": "#ffffff", "sideBar.background": "#f6f6f6", "sideBarSectionHeader.background": "#e4e4e4", @@ -430,8 +430,8 @@ "menubar.selectionForeground": "#111111", "statusBar.foreground": "#111111", "tab.unfocusedInactiveBackground": "#edeef0", - "terminal.background": "#f7f7f7", - "terminal.foreground": "#3b3b3b", + "terminal.background": "#300a24", + "terminal.foreground": "#FFFFFF", "titleBar.activeForeground": "#c0c0c0", "titleBar.inactiveBackground": "#3d3a3a", "titleBar.inactiveForeground": "#959697" -- cgit v1.2.3 From dd833ad4877cd6b7a5f4ad28fee348c643b57d7a Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Wed, 15 Jul 2020 14:48:54 +0200 Subject: Use warning color for normal badges --- themes/dark/yaru-dark.json | 2 +- themes/light/yaru.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/dark/yaru-dark.json b/themes/dark/yaru-dark.json index acc587f..9d5b155 100644 --- a/themes/dark/yaru-dark.json +++ b/themes/dark/yaru-dark.json @@ -358,7 +358,7 @@ "activityBar.dropBackground": "#e9542080", "activityBarBadge.background": "#0c6d1a", "activityBarBadge.foreground": "#ffffff", - "badge.background": "#0c6d1a", + "badge.background": "#991121", "badge.foreground": "#ffffff", "sideBar.background": "#3f3f3f", "sideBarSectionHeader.background": "#575757", diff --git a/themes/light/yaru.json b/themes/light/yaru.json index dedd07c..c369263 100644 --- a/themes/light/yaru.json +++ b/themes/light/yaru.json @@ -358,7 +358,7 @@ "activityBar.dropBackground": "#e9542080", "activityBarBadge.background": "#109a26", "activityBarBadge.foreground": "#ffffff", - "badge.background": "#109a26", + "badge.background": "#c6162b", "badge.foreground": "#ffffff", "sideBar.background": "#f6f6f6", "sideBarSectionHeader.background": "#e4e4e4", -- cgit v1.2.3 From f5dfd6079f7318a5ff72892ca2aeedf32bd95a31 Mon Sep 17 00:00:00 2001 From: Feichtmeier Date: Thu, 16 Jul 2020 10:06:18 +0200 Subject: Yaru-dark: darken bar backgrounds to improve contrast against the new badges --- themes/dark/yaru-dark.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/dark/yaru-dark.json b/themes/dark/yaru-dark.json index 9d5b155..d44271c 100644 --- a/themes/dark/yaru-dark.json +++ b/themes/dark/yaru-dark.json @@ -344,7 +344,7 @@ "button.background": "#e95420", "button.foreground": "#ffffff", "dropdown.background": "#595959", - "input.background": "#595959", + "input.background": "#484848", "inputOption.activeBorder": "#e95420", "list.activeSelectionBackground": "#e95420", "list.activeSelectionForeground": "#FFFFFF", @@ -354,7 +354,7 @@ "list.highlightForeground": "#e95420", "list.hoverBackground": "#575757", "list.inactiveSelectionBackground": "#575757", - "activityBar.background": "#575757", + "activityBar.background": "#484848", "activityBar.dropBackground": "#e9542080", "activityBarBadge.background": "#0c6d1a", "activityBarBadge.foreground": "#ffffff", -- cgit v1.2.3 From 3fa1cda971acdab34ee3f0e7d8e288fcb7c17eae Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 17 Jul 2020 18:25:06 -0400 Subject: Copy Feichtmeier's Yaru changes to .ts source files --- themes/src/dark/yaru-dark.ts | 8 +++++++- themes/src/light/yaru.ts | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/src/dark/yaru-dark.ts b/themes/src/dark/yaru-dark.ts index 22c9d67..33d885c 100644 --- a/themes/src/dark/yaru-dark.ts +++ b/themes/src/dark/yaru-dark.ts @@ -16,9 +16,12 @@ const colors = { menuGray: '#494949', bodyGray: '#383838', editorGray: '#2f2f2f', + activityBarGray: '#484848', sideBarGray: '#3f3f3f', highlightGray: '#575757', commentGray: '#a8a8a8', + badgeGreen: '#0c6d1a', + badgeRed: '#991121', } const colorSet: IColorSet = { @@ -57,7 +60,9 @@ const colorSet: IColorSet = { selection: colors.midAubergine }, overrides: { - 'activityBar.background': colors.highlightGray, + 'activityBar.background': colors.activityBarGray, + 'activityBarBadge.background': colors.badgeGreen, + 'badge.background': colors.badgeRed, 'editor.background': colors.editorGray, 'editorGroupHeader.tabsBackground': colors.bodyGray, 'editorIndentGuide.activeBackground': colors.ubuntuOrange, @@ -68,6 +73,7 @@ const colorSet: IColorSet = { 'menu.selectionBackground': colors.highlightGray, 'menubar.selectionBackground': colors.menuGray, 'panel.background': colors.bodyGray, + 'input.background': colors.activityBarGray, 'sideBar.background': colors.sideBarGray, 'sideBarSectionHeader.background': colors.highlightGray, 'statusBar.background': colors.editorGray, diff --git a/themes/src/light/yaru.ts b/themes/src/light/yaru.ts index 89539b4..01ac6e1 100644 --- a/themes/src/light/yaru.ts +++ b/themes/src/light/yaru.ts @@ -24,6 +24,8 @@ const colors = { textGray: '#111111', ubuntuWarmGray: '#aea79f', guideGray: '#bfbfbf', + badgeGreen: '#109a26', + badgeRed: '#c6162b', } const colorSet: IColorSet = { @@ -67,6 +69,8 @@ const colorSet: IColorSet = { overrides: { 'activityBar.background': colors.highlightGray, 'activityBar.foreground': colors.textGray, + 'activityBarBadge.background': colors.badgeGreen, + 'badge.background': colors.badgeRed, 'debugToolBar.background': colors.white, 'dropdown.background': colors.white, 'editor.background': colors.white, -- cgit v1.2.3 From a1cb49d296e5415e4b1edcd67964ded61596557d Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 17 Jul 2020 18:40:44 -0400 Subject: Improve legibility/consistency of Yaru selection --- themes/dark/yaru-dark.json | 3 +++ themes/light/yaru.json | 5 ++++- themes/src/dark/yaru-dark.ts | 5 ++++- themes/src/light/yaru.ts | 5 ++++- 4 files changed, 15 insertions(+), 3 deletions(-) (limited to 'themes') diff --git a/themes/dark/yaru-dark.json b/themes/dark/yaru-dark.json index d44271c..ca1ef08 100644 --- a/themes/dark/yaru-dark.json +++ b/themes/dark/yaru-dark.json @@ -377,6 +377,9 @@ "editorLineNumber.foreground": "#FFFFFF4d", "editorLineNumber.activeForeground": "#e95420", "editor.selectionBackground": "#5e2750", + "editor.selectionHighlightBackground": "#5e2750aa", + "editor.wordHighlightBackground": "#5e2750aa", + "editor.wordHighlightStrongBackground": "#5e2750aa", "editor.lineHighlightBorder": "#FFFFFF1a", "editor.rangeHighlightBackground": "#FFFFFF0d", "editorWidget.background": "#434343", diff --git a/themes/light/yaru.json b/themes/light/yaru.json index c369263..9d59640 100644 --- a/themes/light/yaru.json +++ b/themes/light/yaru.json @@ -376,7 +376,10 @@ "editor.foreground": "#111111", "editorLineNumber.foreground": "#aea79f", "editorLineNumber.activeForeground": "#e95420", - "editor.selectionBackground": "#903c7b", + "editor.selectionBackground": "#bb90b7aa", + "editor.selectionHighlightBackground": "#bb90b7aa", + "editor.wordHighlightBackground": "#bb90b7aa", + "editor.wordHighlightStrongBackground": "#bb90b7aa", "editor.lineHighlightBorder": "#FFFFFF1a", "editor.rangeHighlightBackground": "#FFFFFF0d", "editorWhitespace.foreground": "#bfbfbf", diff --git a/themes/src/dark/yaru-dark.ts b/themes/src/dark/yaru-dark.ts index 33d885c..fce36ba 100644 --- a/themes/src/dark/yaru-dark.ts +++ b/themes/src/dark/yaru-dark.ts @@ -57,7 +57,10 @@ const colorSet: IColorSet = { brightWhite: '#ffffff', }, ui: { - selection: colors.midAubergine + selection: colors.midAubergine, + selectionHighlight: colors.midAubergine + 'aa', + wordHighlight: colors.midAubergine + 'aa', + wordHighlightStrong: colors.midAubergine + 'aa', }, overrides: { 'activityBar.background': colors.activityBarGray, diff --git a/themes/src/light/yaru.ts b/themes/src/light/yaru.ts index 01ac6e1..d59ac96 100644 --- a/themes/src/light/yaru.ts +++ b/themes/src/light/yaru.ts @@ -64,7 +64,10 @@ const colorSet: IColorSet = { ui: { invisibles: colors.guideGray, guide: colors.guideGray, - selection: colors.midAubergine, + selection: colors.lightAubergine + 'aa', + selectionHighlight: colors.lightAubergine + 'aa', + wordHighlight: colors.lightAubergine + 'aa', + wordHighlightStrong: colors.lightAubergine + 'aa', }, overrides: { 'activityBar.background': colors.highlightGray, -- cgit v1.2.3 From 5675f5d0e25a81112175474394d15f7d2edf9b21 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 17 Jul 2020 18:52:56 -0400 Subject: Make Yaru Dark a little darker Darken sidebar section headers so they continue to match the activity bar, and darken the dropdown background so it continues to match the input background. Darken the sidebar for better contrast with new section header color and to match the Settings app sidebar in 20.04 Yaru Dark. --- themes/dark/yaru-dark.json | 6 +++--- themes/src/dark/yaru-dark.ts | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'themes') diff --git a/themes/dark/yaru-dark.json b/themes/dark/yaru-dark.json index ca1ef08..81af7cb 100644 --- a/themes/dark/yaru-dark.json +++ b/themes/dark/yaru-dark.json @@ -343,7 +343,7 @@ "foreground": "#FFFFFF", "button.background": "#e95420", "button.foreground": "#ffffff", - "dropdown.background": "#595959", + "dropdown.background": "#484848", "input.background": "#484848", "inputOption.activeBorder": "#e95420", "list.activeSelectionBackground": "#e95420", @@ -360,8 +360,8 @@ "activityBarBadge.foreground": "#ffffff", "badge.background": "#991121", "badge.foreground": "#ffffff", - "sideBar.background": "#3f3f3f", - "sideBarSectionHeader.background": "#575757", + "sideBar.background": "#343434", + "sideBarSectionHeader.background": "#484848", "editorGroup.dropBackground": "#e9542080", "editorGroup.focusedEmptyBorder": "#e95420", "editorGroupHeader.tabsBackground": "#383838", diff --git a/themes/src/dark/yaru-dark.ts b/themes/src/dark/yaru-dark.ts index fce36ba..008bc7b 100644 --- a/themes/src/dark/yaru-dark.ts +++ b/themes/src/dark/yaru-dark.ts @@ -17,7 +17,7 @@ const colors = { bodyGray: '#383838', editorGray: '#2f2f2f', activityBarGray: '#484848', - sideBarGray: '#3f3f3f', + sideBarGray: '#343434', highlightGray: '#575757', commentGray: '#a8a8a8', badgeGreen: '#0c6d1a', @@ -77,8 +77,9 @@ const colorSet: IColorSet = { 'menubar.selectionBackground': colors.menuGray, 'panel.background': colors.bodyGray, 'input.background': colors.activityBarGray, + 'dropdown.background': colors.activityBarGray, 'sideBar.background': colors.sideBarGray, - 'sideBarSectionHeader.background': colors.highlightGray, + 'sideBarSectionHeader.background': colors.activityBarGray, 'statusBar.background': colors.editorGray, 'tab.inactiveBackground': colors.bodyGray, 'tab.unfocusedInactiveBackground': colors.bodyGray, -- cgit v1.2.3