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/src') 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/src/dark/yaru-dark.ts | 5 ++++- themes/src/light/yaru.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'themes/src') 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/src/dark/yaru-dark.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'themes/src') 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