Yaru: Tune syntax colors

4 files changed, 37 insertions, 33 deletions

diff --git a/package-lock.json b/package-lock.json
index 62de105..0787a89 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,6 +98,12 @@
       "integrity": "sha1-AbcCR6bTwkZ/cMRXle9eoYzhkdU=",
       "dev": true
     },
+    "vscode-theme-generator": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/vscode-theme-generator/-/vscode-theme-generator-0.0.21.tgz",
+      "integrity": "sha512-kP4+Npk5RuZJEoII/uH1B2ZtAJJQSwAgPEK7cVHCJ1oA84E//OsCd1VeX/6Ye519Ty8Z0iJf2RlOP0HHzAKe1w==",
+      "dev": true
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index 118631a..8138884 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
         "path": "./themes/light/arc.json"
       },
       {
-        "label": "Yaru [Beta]",
+        "label": "Yaru",
         "uiTheme": "vs",
         "path": "./themes/light/yaru.json"
       }
diff --git a/themes/light/yaru.json b/themes/light/yaru.json
index c80fd0b..ce539e6 100644
--- a/themes/light/yaru.json
+++ b/themes/light/yaru.json
@@ -1,5 +1,5 @@
 {
-  "name": "Yaru [Beta]",
+  "name": "Yaru",
   "tokenColors": [
     {
       "name": "Global settings",
@@ -33,7 +33,7 @@
       "name": "Number",
       "scope": "constant.numeric",
       "settings": {
-        "foreground": "#006666"
+        "foreground": "#008080"
       }
     },
     {
@@ -54,7 +54,7 @@
       "name": "Function call",
       "scope": "entity.name.function, support.function",
       "settings": {
-        "foreground": "#006666"
+        "foreground": "#008080"
       }
     },
     {
@@ -76,21 +76,21 @@
       "name": "Type",
       "scope": "support.type",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "Type",
       "scope": "entity.name.type, entity.other.inherited-class",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "Comment",
       "scope": "comment",
       "settings": {
-        "foreground": "#333333",
+        "foreground": "#8c8c8c",
         "fontStyle": "italic"
       }
     },
@@ -98,7 +98,7 @@
       "name": "Class",
       "scope": "entity.name.type.class",
       "settings": {
-        "foreground": "00ff00",
+        "foreground": "#00b300",
         "fontStyle": "underline"
       }
     },
@@ -106,21 +106,21 @@
       "name": "Class variable",
       "scope": "variable.object.property, meta.field.declaration entity.name.function",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "Class method",
       "scope": "meta.definition.method entity.name.function",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "Function definition",
       "scope": "meta.function entity.name.function",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
@@ -176,7 +176,7 @@
       "name": "CSS tag",
       "scope": "source.css entity.name.tag",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
@@ -197,7 +197,7 @@
       "name": "HTML tag attribute",
       "scope": "entity.other.attribute-name",
       "settings": {
-        "foreground": "#006666"
+        "foreground": "#008080"
       }
     },
     {
@@ -218,7 +218,7 @@
       "name": "Markdown block quote",
       "scope": "text.html.markdown markup.quote",
       "settings": {
-        "foreground": "#333333"
+        "foreground": "#8c8c8c"
       }
     },
     {
@@ -284,7 +284,7 @@
       "name": "C# class",
       "scope": "source.cs meta.class.identifier storage.type",
       "settings": {
-        "foreground": "00ff00",
+        "foreground": "#00b300",
         "fontStyle": "underline"
       }
     },
@@ -292,35 +292,35 @@
       "name": "C# class method",
       "scope": "source.cs meta.method.identifier entity.name.function",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "C# function call",
       "scope": "source.cs meta.method-call meta.method, source.cs entity.name.function",
       "settings": {
-        "foreground": "#006666"
+        "foreground": "#008080"
       }
     },
     {
       "name": "C# type",
       "scope": "source.cs storage.type",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "C# return type",
       "scope": "source.cs meta.method.return-type",
       "settings": {
-        "foreground": "00ff00"
+        "foreground": "#00b300"
       }
     },
     {
       "name": "C# preprocessor",
       "scope": "source.cs meta.preprocessor",
       "settings": {
-        "foreground": "#333333"
+        "foreground": "#8c8c8c"
       }
     },
     {
@@ -371,8 +371,8 @@
     "editor.selectionBackground": "#903c7b",
     "editor.lineHighlightBorder": "#FFFFFF1a",
     "editor.rangeHighlightBackground": "#FFFFFF0d",
-    "editorWhitespace.foreground": "#aea79f",
-    "editorIndentGuide.background": "#aea79f",
+    "editorWhitespace.foreground": "#bfbfbf",
+    "editorIndentGuide.background": "#bfbfbf",
     "editorWidget.background": "#f6f6f6",
     "editorHoverWidget.background": "#f6f6f6",
     "editorMarkerNavigation.background": "#f6f6f6",
diff --git a/themes/src/light/yaru.ts b/themes/src/light/yaru.ts
index b301c6d..02c80e4 100644
--- a/themes/src/light/yaru.ts
+++ b/themes/src/light/yaru.ts
@@ -1,12 +1,12 @@
 import * as path from 'path';
 import { generateTheme, IColorSet } from 'vscode-theme-generator';
 
-const themeName = 'Yaru [Beta]';
+const themeName = 'Yaru';
 const colors = {
   white: '#FFFFFF',
-  cyan: '#006666',
+  cyan: '#008080',
   red: '#ff0000',
-  green: '00ff00',
+  green: '#00b300',
   ubuntuOrange: '#e95420',
   lightAubergine: '#bb90b7',
   midAubergine: '#903c7b',
@@ -20,10 +20,10 @@ const colors = {
   editorGray: '#2f2f2f',
   sideBarWhite: '#f6f6f6',
   highlightGray: '#e4e4e4',
-  commentGray: '#a8a8a8',
+  commentGray: '#8c8c8c',
   textGray: '#111111',
   ubuntuWarmGray: '#aea79f',
-  ubuntuCoolGray: '#333333',
+  guideGray: '#bfbfbf',
 }
 
 const colorSet: IColorSet = {
@@ -37,11 +37,9 @@ const colorSet: IColorSet = {
     color4: colors.cyan
   },
   syntax: {
-    comment: colors.ubuntuCoolGray,
+    comment: colors.commentGray,
     keyword: colors.midAubergine,
-    class: colors.green,
-    type: colors.green,
-    markdownQuote: colors.ubuntuCoolGray,
+    markdownQuote: colors.commentGray,
   },
   terminal: {
     black: '#000000',
@@ -62,8 +60,8 @@ const colorSet: IColorSet = {
     brightWhite: '#ffffff',
   },
   ui: {
-    invisibles: colors.ubuntuWarmGray,
-    guide: colors.ubuntuWarmGray,
+    invisibles: colors.guideGray,
+    guide: colors.guideGray,
     selection: colors.midAubergine,
   },
   overrides: {