From 4e5dc8778f2b59e5bcdf43d5622cec779570b8e9 Mon Sep 17 00:00:00 2001 From: Alex Simons Date: Wed, 19 May 2021 17:48:57 -0500 Subject: [PATCH] Look and Feel Enhancements (#72) * Updated Base Colors * Updated text colors * Updated action colors * Updated button control * Updated Zero Two's dark selection color * Updated input control * Updated list and trees * Updated activity bar * Updated editor groups and tabs * Updated some of the billion editor colors * Updated status bar stuff * Updated keybinding colors * Updated debug colors * Updated Mai's dark selection background * Updated testing colors? * Updated welcome page colors * Updated settings ui * Updated breadcrumbs * Updated snippet colors * I dunno if symbol backgrounds work, left off at interface * Updated debug colors * Moar colors * Updated changelog and bumped version to v12.2.0 --- CHANGELOG.md | 4 + .../assets/templates/base.laf.template.json | 101 +++++++++++++++++- .../mai/dark/mai.dark.vsCode.definition.json | 3 +- .../dark/zero.two.dark.vsCode.definition.json | 3 +- buildSrc/src/BuildThemes.ts | 7 +- package.json | 44 ++++---- src/NotificationService.ts | 2 +- 7 files changed, 133 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ae70b..79e1042 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +# 12.2.0 [Theme Color Enhancements] + +- Combed over the [Theme Colors](https://code.visualstudio.com/api/references/theme-color) provided by VS-Code to give the look and feel more themed colors! + # 12.1.0 [Usability Updates] - Fixed selection usability issues for all themes [#68](https://github.com/doki-theme/doki-theme-vscode/issues/68) diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json index 8d4d9ba..eac92ba 100644 --- a/buildSrc/assets/templates/base.laf.template.json +++ b/buildSrc/assets/templates/base.laf.template.json @@ -1,18 +1,36 @@ { "name": "base", "ui": { - "foreground": "&foregroundColor&", + "foreground": "&foregroundColor&", "editor.foreground": "&foregroundColorEditor&", "dropdown.foreground": "&foregroundColor&", "panelTitle.activeForeground": "&foregroundColor&", "panelTitle.inactiveForeground": "&foregroundColor&", "gitDecoration.ignoredResourceForeground": "&disabledColor&", + "list.invalidItemForeground": "&disabledColor&", + "list.errorForeground": "&errorColor&", + "editorError.foreground": "&errorColor&", "input.background": "&secondaryBackground&AA", "peekViewResult.background": "&secondaryBackground&", + "peekViewResult.fileForeground": "&infoForeground&", + "peekViewTitleDescription.foreground": "&infoForeground&", "list.focusBackground": "&selectionBackground&", "quickInput.list.focusBackground": "&selectionBackground&AA", "quickInput.foreground": "&foregroundColor&", + "peekViewTitleLabel.foreground": "&foregroundColor&", "selection.background": "&accentColor&", + "editorGutter.modifiedBackground": "&diff.modified&", + "editorGutter.addedBackground": "&diff.inserted&", + "editorGutter.deletedBackground": "&diff.deleted&", + "editorUnnecessaryCode.border": "&unusedColor&", + "editorGroup.dropBackground": "&identifierHighlight&AA", + "panelSection.dropBackground": "&identifierHighlight&AA", + "statusBarItem.prominentBackground": "&selectionBackground&AA", + "statusBarItem.prominentForeground": "&selectionForeground&", + "keybindingLabel.background": "&buttonColor&", + "keybindingLabel.foreground": "&buttonFont&", + "keybindingLabel.bottomBorder": "&borderColor&", + "tab.hoverBackground": "&highlightColor&AA", "list.activeSelectionBackground": "&selectionBackground&", "peekViewResult.selectionBackground": "&selectionBackground&", "list.hoverBackground": "&selectionBackground&2A", @@ -22,12 +40,18 @@ "list.activeSelectionForeground": "&selectionForeground&", "list.focusForeground": "&selectionForeground&", "pickerGroup.foreground": "&infoForeground&", + "descriptionForeground": "&infoForeground&", "gitlens.trailingLineForegroundColor": "&infoForeground&99", "input.placeholderForeground": "&infoForeground&", "list.deemphasizedForeground": "&infoForeground&", + "inputValidation.errorBackground": "&diff.conflict&", + "minimap.errorHighlight": "&errorColor&AA", + "inputValidation.errorForeground": "&errorColor&", + "inputValidation.warningBackground": "&nonProjectFileScopeColor&", "list.inactiveSelectionBackground": "&selectionInactive&99", "list.inactiveSelectionForeground": "&foregroundColor&", "editor.background": "&textEditorBackground&", + "errorForeground": "&errorColor&", "tab.activeBackground": "&highlightColor&", "panelSectionHeader.background": "&headerColor&", "focusBorder": "&borderColor&", @@ -44,7 +68,7 @@ "activityBar.border": "&borderColor&", "editorGroup.border": "&borderColor&", "editorOverviewRuler.border": "&borderColor&", - "editorError.border": "&borderColor&", + "editorError.border": "&diff.conflict&", "editorWarning.border": "&borderColor&", "editorInfo.border": "&borderColor&", "editorHint.border": "&borderColor&", @@ -58,6 +82,7 @@ "notifications.border": "&borderColor&", "editorCursor.background": "&accentContrastColor&", "terminalCursor.background": "&textEditorBackground&", + "terminalCursor.foreground": "&accentColor&", "editorSuggestWidget.border": "&textEditorBackground&", "panel.background": "&textEditorBackground&", "sideBar.background": "&textEditorBackground&", @@ -66,6 +91,16 @@ "dropdown.background": "&textEditorBackground&", "editorLineNumber.foreground": "&lineNumberColor&", "gitlens.gutterForegroundColor": "&lineNumberColor&", + "checkbox.border": "&baseIconColor&", + "checkbox.foreground": "&accentColor&", + "toolbar.hoverBackground": "&highlightColor&", + "toolbar.hoverOutline": "&highlightColor&", + "toolbar.activeBackground": "&highlightColor&", + "textLink.foreground": "&editorAccentColor&AA", + "textLink.activeForeground": "&editorAccentColor&", + "textBlockQuote.background": "&codeBlock&", + "textCodeBlock.background": "&codeBlock&", + "textSeparator.foreground": "&borderColor&", "editorCursor.foreground": "&accentColor&", "editorWidget.border": "&accentColor&", "list.highlightForeground": "&accentColor&", @@ -75,12 +110,13 @@ "peekView.border": "&accentColor&", "statusBar.background": "&accentColor&", "statusBar.noFolderBackground": "&accentColor&", - "panelTitle.activeBorder":"&accentColor&", + "panelTitle.activeBorder": "&accentColor&", "statusBar.debuggingBackground": "&accentColor&", "editorBracketMatch.border": "&accentColor&", "gitDecoration.modifiedResourceForeground": "&accentColor&", "activityBar.foreground": "&accentColor&", "activityBarBadge.background": "&accentColor&", + "activityBarBadge.foreground": "&accentContrastColor&", "badge.background": "&accentColor&", "badge.foreground": "&accentContrastColor&", "progressBar.background": "&accentColor&", @@ -97,8 +133,23 @@ "sideBarSectionHeader.background": "&caretRow&90", "activityBar.background": "&caretRow&", "editorGutter.background": "#00000000", + "symbolIcon.arrayForeground": "&constantColor&", + "symbolIcon.constantForeground": "&constantColor&", + "symbolIcon.enumeratorMemberForeground": "&constantColor&", + "symbolIcon.booleanForeground": "&keywordColor&", + "symbolIcon.classForeground": "&classNameColor&", + "symbolIcon.enumeratorForeground": "&keyColor&", + "symbolIcon.fieldForeground": "&keyColor&", + "symbolIcon.constructorForeground": "&classNameColor&", + "symbolIcon.functionForeground": "&editorAccentColor&", + "symbolIcon.colorForeground": "&accentColor&", + "symbolIcon.eventForeground": "&accentColor&", + "symbolIcon.fileForeground": "&baseIconColor&", + "symbolIcon.folderForeground": "&baseIconColor&", + "symbolIcon.interfaceForeground": "&stringColor&", "editor.findMatchBackground": "&selectionBackground&", "editor.wordHighlightStrongBackground": "&identifierHighlight&AA", + "editor.snippetTabstopHighlightBackground": "&identifierHighlight&AA", "editor.findMatchHighlightBackground": "&selectionInactive&", "peekViewEditor.matchHighlightBackground": "&selectionInactive&", "editor.wordHighlightBackground": "&identifierHighlight&AA", @@ -107,6 +158,28 @@ "peekViewResult.matchHighlightBackground": "&selectionInactive&", "editorWidget.background": "&headerColor&", "debugToolBar.background": "&headerColor&", + "debugView.stateLabelBackground": "&highlightColor&", + "debugTokenExpression.string": "&stringColor&", + "debugTokenExpression.boolean": "&keywordColor&", + "debugTokenExpression.value": "&infoForeground&", + "debugTokenExpression.number": "&constantColor&", + "debugTokenExpression.error": "&errorColor&", + "debugTokenExpression.name": "&classNameColor&", + "breadcrumb.foreground": "&lineNumberColor&", + "breadcrumb.focusForeground": "&infoForeground&", + "breadcrumb.activeSelectionForeground": "&editorAccentColor&", + "testing.iconFailed": "&errorColor&", + "testing.iconErrored": "&errorColor&", + "testing.runAction": "&accentColor&", + "welcomePage.tileBackground": "&codeBlock&AA", + "welcomePage.buttonBackground": "&codeBlock&AA", + "welcomePage.tileHoverBackground": "&selectionBackground&AA", + "welcomePage.buttonHoverBackground": "&selectionBackground&AA", + "testing.message.hint.decorationForeground": "&infoForeground&", + "settings.focusedRowBackground": "&highlightColor&", + "notebook.focusedRowBorder": "&highlightColor&", + "notebook.rowHoverBackground": "&caretRow&", + "debugView.valueChangedHighlight": "&selectionBackground&99", "editorSuggestWidget.background": "&headerColor&", "notifications.background": "&headerColor&80", "peekViewTitle.background": "&headerColor&", @@ -125,11 +198,29 @@ "terminal.ansiCyan": "#75D7EC", "editor.stackFrameHighlightBackground": "&selectionBackground&", "debugIcon.breakpointCurrentStackframeForeground": "&selectionBackground&", + "debugIcon.breakpointDisabledForeground": "&disabledColor&", + "debugIcon.breakpointUnverifiedForeground": "&unusedColor&", + "debugIcon.startForeground": "&accentColor&", + "debugIcon.continueForeground": "&accentColor&", + "debugIcon.stepOverForeground": "&terminal.ansiBlue&", + "debugIcon.stepIntoForeground": "&terminal.ansiYellow&", + "debugIcon.stopForeground": "&errorColor&", + "debugIcon.stepOutForeground": "&terminal.ansiCyan&", + "debugIcon.restartForeground": "&terminal.ansiGreen&", + "debugConsole.infoForeground": "&infoForeground&", + "debugConsole.errorForeground": "&errorColor&", + "debugConsole.sourceForeground": "&editorAccentColor&", "debugIcon.breakpointStackframeForeground": "&selectionInactive&", "editor.focusedStackFrameHighlightBackground": "&selectionInactive&", "diffEditor.removedTextBackground": "&diff.deleted&50", "diffEditor.insertedTextBackground": "&diff.inserted&50", "gitlens.gutterUncommittedForegroundColor": "&diff.modified&", - "gitlens.lineHighlightBackgroundColor": "&diff.inserted&50" + "gitlens.lineHighlightBackgroundColor": "&diff.inserted&50", + "charts.red": "&terminal.ansiRed&", + "charts.blue": "&terminal.ansiBlue&", + "charts.yellow": "&terminal.ansiYellow&", + "charts.orange": "&editorAccentColor&", + "charts.green": "&terminal.ansiGreen&", + "charts.purple": "&keyColor&" } -} +} \ No newline at end of file diff --git a/buildSrc/assets/themes/bunnySenpai/mai/dark/mai.dark.vsCode.definition.json b/buildSrc/assets/themes/bunnySenpai/mai/dark/mai.dark.vsCode.definition.json index b122ede..e3ad39a 100644 --- a/buildSrc/assets/themes/bunnySenpai/mai/dark/mai.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/bunnySenpai/mai/dark/mai.dark.vsCode.definition.json @@ -4,7 +4,8 @@ "laf": { "extends": "dark-contrast", "ui": { - "editor.selectionBackground": "&selectionBackground&99" + "editor.selectionBackground": "&selectionBackground&99", + "selection.background": "&selectionBackground&aa" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/franxx/zeroTwo/dark/zero.two.dark.vsCode.definition.json b/buildSrc/assets/themes/franxx/zeroTwo/dark/zero.two.dark.vsCode.definition.json index 63c37e6..ebd9db8 100644 --- a/buildSrc/assets/themes/franxx/zeroTwo/dark/zero.two.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/franxx/zeroTwo/dark/zero.two.dark.vsCode.definition.json @@ -4,7 +4,8 @@ "laf": { "extends": "dark-contrast", "ui": { - "editor.selectionBackground": "&selectionBackground&66" + "editor.selectionBackground": "&selectionBackground&66", + "selection.background": "&selectionBackground&aa" } }, "syntax": {}, diff --git a/buildSrc/src/BuildThemes.ts b/buildSrc/src/BuildThemes.ts index 3e1623c..bbb969f 100644 --- a/buildSrc/src/BuildThemes.ts +++ b/buildSrc/src/BuildThemes.ts @@ -71,10 +71,15 @@ function buildLAFColors( dokiThemeTemplateJson, ); - return applyNamedColors(resolvedLafTemplate, { + const evaluatedColors: StringDictionary = { ...resolvedMasterNameColors, ...resolvedNamedColors, ...dokiVSCodeThemeTemplateJson.colors, + }; + return applyNamedColors(resolvedLafTemplate, { + ...evaluatedColors, + editorAccentColor: dokiThemeTemplateJson.overrides?.editorScheme?.colors?.accentColor || + evaluatedColors.accentColor, }); } diff --git a/package.json b/package.json index f144154..773bbb5 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "The Doki Theme", "description": "A bunch of themes with cute anime girls. Code with your waifu!", "publisher": "unthrottled", - "version": "12.1.0", + "version": "12.2.0", "license": "MIT", "icon": "Doki-Theme.png", "galleryBanner": { @@ -694,12 +694,6 @@ "path": "./generatedThemes/Mai Light.theme.json", "uiTheme": "vs" }, - { - "id": "9a310731-ab2d-40f5-b502-fa5419f799a2", - "label": "Doki Theme: DDLC: Monika", - "path": "./generatedThemes/Monika Light.theme.json", - "uiTheme": "vs" - }, { "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3", "label": "Doki Theme: DDLC: Monika", @@ -707,9 +701,9 @@ "uiTheme": "vs-dark" }, { - "id": "91415015-8fe3-48eb-9951-70a5cd6cbb7f", - "label": "Doki Theme: DDLC: Natsuki", - "path": "./generatedThemes/Natsuki Light.theme.json", + "id": "9a310731-ab2d-40f5-b502-fa5419f799a2", + "label": "Doki Theme: DDLC: Monika", + "path": "./generatedThemes/Monika Light.theme.json", "uiTheme": "vs" }, { @@ -718,6 +712,12 @@ "path": "./generatedThemes/Natsuki Dark.theme.json", "uiTheme": "vs-dark" }, + { + "id": "91415015-8fe3-48eb-9951-70a5cd6cbb7f", + "label": "Doki Theme: DDLC: Natsuki", + "path": "./generatedThemes/Natsuki Light.theme.json", + "uiTheme": "vs" + }, { "id": "cb8ef4b7-0844-4a04-b08b-754086598de4", "label": "Doki Theme: DDLC: Sayori", @@ -730,18 +730,18 @@ "path": "./generatedThemes/Sayori Dark.theme.json", "uiTheme": "vs-dark" }, - { - "id": "cecf3f92-76d4-4f14-9a9c-3d558b6b3b68", - "label": "Doki Theme: DDLC: Yuri", - "path": "./generatedThemes/Yuri Light.theme.json", - "uiTheme": "vs" - }, { "id": "a14733d6-8e15-4e75-b6b8-509f323e5b3b", "label": "Doki Theme: DDLC: Yuri", "path": "./generatedThemes/Yuri Dark.theme.json", "uiTheme": "vs-dark" }, + { + "id": "cecf3f92-76d4-4f14-9a9c-3d558b6b3b68", + "label": "Doki Theme: DDLC: Yuri", + "path": "./generatedThemes/Yuri Light.theme.json", + "uiTheme": "vs" + }, { "id": "b93ab4ea-ff96-4459-8fa2-0caae5bc7116", "label": "Doki Theme: DM: Kanna", @@ -826,18 +826,18 @@ "path": "./generatedThemes/Aqua.theme.json", "uiTheme": "vs-dark" }, - { - "id": "8474d98d-7bb1-462c-82b1-dd7c512142a6", - "label": "Doki Theme: KonoSuba: Darkness", - "path": "./generatedThemes/Darkness Light.theme.json", - "uiTheme": "vs" - }, { "id": "774ec7ad-d6a0-4d9c-b195-2f54d72ab664", "label": "Doki Theme: KonoSuba: Darkness", "path": "./generatedThemes/Darkness Dark.theme.json", "uiTheme": "vs-dark" }, + { + "id": "8474d98d-7bb1-462c-82b1-dd7c512142a6", + "label": "Doki Theme: KonoSuba: Darkness", + "path": "./generatedThemes/Darkness Light.theme.json", + "uiTheme": "vs" + }, { "id": "63fe4617-4cac-47a5-9b93-6794514c35ad", "label": "Doki Theme: KonoSuba: Megumin", diff --git a/src/NotificationService.ts b/src/NotificationService.ts index 568d2c1..3079e45 100644 --- a/src/NotificationService.ts +++ b/src/NotificationService.ts @@ -3,7 +3,7 @@ import { VSCodeGlobals } from "./VSCodeGlobals"; import { attemptToGreetUser } from "./WelcomeService"; const SAVED_VERSION = "doki.theme.version"; -const DOKI_THEME_VERSION = "v12.1.0"; +const DOKI_THEME_VERSION = "v12.2.0"; export function attemptToNotifyUpdates(context: vscode.ExtensionContext) { const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);