From 38930750a2a81ec2d6e6cb904f3ae202d98139a7 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sat, 9 Feb 2019 18:12:29 -0500 Subject: Yaru: Add (light) theme --- themes/src/light/yaru.ts | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 themes/src/light/yaru.ts (limited to 'themes/src/light') diff --git a/themes/src/light/yaru.ts b/themes/src/light/yaru.ts new file mode 100644 index 0000000..b301c6d --- /dev/null +++ b/themes/src/light/yaru.ts @@ -0,0 +1,116 @@ +import * as path from 'path'; +import { generateTheme, IColorSet } from 'vscode-theme-generator'; + +const themeName = 'Yaru [Beta]'; +const colors = { + white: '#FFFFFF', + cyan: '#006666', + red: '#ff0000', + green: '00ff00', + ubuntuOrange: '#e95420', + lightAubergine: '#bb90b7', + midAubergine: '#903c7b', + darkAubergine: '#300a24', + titleBarGray: '#2b2929', + inactiveTitleBarGray: '#3d3a3a', + titleBarText: '#c0c0c0', + titleBarTextInactive: '#959697', + menuGray: '#494949', + bodyGray: '#edeef0', + editorGray: '#2f2f2f', + sideBarWhite: '#f6f6f6', + highlightGray: '#e4e4e4', + commentGray: '#a8a8a8', + textGray: '#111111', + ubuntuWarmGray: '#aea79f', + ubuntuCoolGray: '#333333', +} + +const colorSet: IColorSet = { + type: 'light', + base: { + background: colors.bodyGray, + foreground: colors.textGray, + color1: colors.ubuntuOrange, + color2: colors.red, + color3: colors.green, + color4: colors.cyan + }, + syntax: { + comment: colors.ubuntuCoolGray, + keyword: colors.midAubergine, + class: colors.green, + type: colors.green, + markdownQuote: colors.ubuntuCoolGray, + }, + terminal: { + black: '#000000', + red: '#aa0000', + green: '#00aa00', + yellow: '#aa5500', + blue: '#0000aa', + magenta: '#aa00aa', + cyan: '#00aaaa', + white: '#aaaaaa', + brightBlack: '#555555', + brightRed: '#ff5555', + brightGreen: '#55ff55', + brightYellow: '#ffff55', + brightBlue: '#5555ff', + brightMagenta: '#ff55ff', + brightCyan: '#55ffff', + brightWhite: '#ffffff', + }, + ui: { + invisibles: colors.ubuntuWarmGray, + guide: colors.ubuntuWarmGray, + selection: colors.midAubergine, + }, + overrides: { + 'activityBar.background': colors.highlightGray, + 'activityBar.foreground': colors.textGray, + 'debugToolBar.background': colors.white, + 'dropdown.background': colors.white, + 'editor.background': colors.white, + 'editorGroupHeader.tabsBackground': colors.bodyGray, + 'editorHoverWidget.background': colors.sideBarWhite, + 'editorLineNumber.foreground': colors.ubuntuWarmGray, + 'editorMarkerNavigation.background': colors.sideBarWhite, + 'editorSuggestWidget.background': colors.sideBarWhite, + 'editorWidget.background': colors.sideBarWhite, + 'input.background': colors.white, + 'list.activeSelectionBackground': colors.ubuntuOrange, + 'list.hoverBackground': colors.highlightGray, + 'list.inactiveSelectionBackground': colors.highlightGray, + 'menu.background': colors.white, + 'menu.selectionBackground': colors.highlightGray, + 'menu.selectionForeground': colors.textGray, + 'menubar.selectionBackground': colors.white, + 'menubar.selectionForeground': colors.textGray, + 'panel.background': colors.bodyGray, + 'peekViewEditor.background': colors.white, + 'peekViewResult.background': colors.sideBarWhite, + 'peekViewTitle.background': colors.sideBarWhite, + 'sideBar.background': colors.sideBarWhite, + 'sideBarSectionHeader.background': colors.highlightGray, + 'statusBar.background': colors.white, + 'statusBar.debuggingForeground': colors.white, + 'statusBar.foreground': colors.textGray, + 'tab.inactiveBackground': colors.bodyGray, + 'tab.unfocusedInactiveBackground': colors.bodyGray, + 'terminal.background': colors.darkAubergine, + 'terminal.foreground': colors.white, + 'titleBar.activeBackground': colors.titleBarGray, + 'titleBar.activeForeground': colors.titleBarText, + 'titleBar.inactiveBackground': colors.inactiveTitleBarGray, + 'titleBar.inactiveForeground': colors.titleBarTextInactive, + } +}; + +var fileName = themeName + .toLowerCase() + .replace(/\[\w*\]/, '') + .trim() + .replace(/\s+/, '-') + '.json'; + +generateTheme(themeName, colorSet, path.join(__dirname, fileName)); \ No newline at end of file -- cgit v1.2.3 From bb5d9edf52ca0a38b48b694597336c0521b781ae Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 18 Feb 2019 21:47:45 -0500 Subject: Yaru: Tune syntax colors --- package-lock.json | 6 ++++++ package.json | 2 +- themes/light/yaru.json | 42 +++++++++++++++++++++--------------------- themes/src/light/yaru.ts | 20 +++++++++----------- 4 files changed, 37 insertions(+), 33 deletions(-) (limited to 'themes/src/light') 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: { -- cgit v1.2.3