Merge pull request #29 from Feichtmeier/Tiny_improvements_to_yaru

Minor improvements

4 files changed, 38 insertions, 15 deletions

diff --git a/themes/dark/yaru-dark.json b/themes/dark/yaru-dark.json
index d28fd5e..81af7cb 100644
--- a/themes/dark/yaru-dark.json
+++ b/themes/dark/yaru-dark.json
@@ -343,8 +343,8 @@
     "foreground": "#FFFFFF",
     "button.background": "#e95420",
     "button.foreground": "#ffffff",
-    "dropdown.background": "#595959",
-    "input.background": "#595959",
+    "dropdown.background": "#484848",
+    "input.background": "#484848",
     "inputOption.activeBorder": "#e95420",
     "list.activeSelectionBackground": "#e95420",
     "list.activeSelectionForeground": "#FFFFFF",
@@ -354,14 +354,14 @@
     "list.highlightForeground": "#e95420",
     "list.hoverBackground": "#575757",
     "list.inactiveSelectionBackground": "#575757",
-    "activityBar.background": "#575757",
+    "activityBar.background": "#484848",
     "activityBar.dropBackground": "#e9542080",
-    "activityBarBadge.background": "#e95420",
+    "activityBarBadge.background": "#0c6d1a",
     "activityBarBadge.foreground": "#ffffff",
-    "badge.background": "#e95420",
+    "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",
@@ -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 7198802..9d59640 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": "#109a26",
     "activityBarBadge.foreground": "#ffffff",
-    "badge.background": "#e95420",
+    "badge.background": "#c6162b",
     "badge.foreground": "#ffffff",
     "sideBar.background": "#f6f6f6",
     "sideBarSectionHeader.background": "#e4e4e4",
@@ -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 22c9d67..008bc7b 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',
-  sideBarGray: '#3f3f3f',
+  activityBarGray: '#484848',
+  sideBarGray: '#343434',
   highlightGray: '#575757',
   commentGray: '#a8a8a8',
+  badgeGreen: '#0c6d1a',
+  badgeRed: '#991121',
 }
 
 const colorSet: IColorSet = {
@@ -54,10 +57,15 @@ 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.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,8 +76,10 @@ const colorSet: IColorSet = {
     'menu.selectionBackground': colors.highlightGray,
     '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,
diff --git a/themes/src/light/yaru.ts b/themes/src/light/yaru.ts
index 89539b4..d59ac96 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 = {
@@ -62,11 +64,16 @@ 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,
     'activityBar.foreground': colors.textGray,
+    'activityBarBadge.background': colors.badgeGreen,
+    'badge.background': colors.badgeRed,
     'debugToolBar.background': colors.white,
     'dropdown.background': colors.white,
     'editor.background': colors.white,