diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcd69c..74d098f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 88.5-1.6.1 [Cleanups] + +- Cleaned up build process to use correct colors. +- Renamed stuff to reflect `main` branch rename. + ## 88.4-1.6.0 [VS Code Web Support] - Extension now supported in [VSCode for the web](https://code.visualstudio.com/docs/editor/vscode-web). @@ -292,15 +297,15 @@ Anime is trash...._and so am I_. # 14.1.0 [Custom Assets] Added the ability for you to add your own assets to be used by the themes! -Please see the [README.md](https://github.com/doki-theme/doki-theme-vscode/tree/master#custom-assets) for more details. +Please see the [README.md](https://github.com/doki-theme/doki-theme-vscode/tree/main#custom-assets) for more details. | **Custom Sticker** | **Custom Background** | | --- | --- | -| ![custom_sticker](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/master/readmeStuff/custom_sticker.gif) | ![custom_background](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/master/readmeStuff/custom_background.gif) | +| ![custom_sticker](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/main/readmeStuff/custom_sticker.gif) | ![custom_background](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/main/readmeStuff/custom_background.gif) | | **Custom Wallpaper** | | --- | -| ![custom_wallpaper](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/master/readmeStuff/custom_wallpaper.png)| +| ![custom_wallpaper](https://raw.githubusercontent.com/doki-theme/doki-theme-vscode/main/readmeStuff/custom_wallpaper.png)| # 14.0.0 [NekoPara Release] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 651da55..e7b55b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -151,7 +151,7 @@ original JetBrains plugin which uses all the colors defined. There is also Doki the IDE as well. Please follow -the [theme creation contributions in the JetBrains Plugin repository](https://github.com/doki-theme/doki-theme-jetbrains/blob/master/CONTRIBUTING.md#creating-new-themes) +the [theme creation contributions in the JetBrains Plugin repository](https://github.com/doki-theme/doki-theme-jetbrains/blob/main/CONTRIBUTING.md#creating-new-themes) for more details on how to build new themes. ## Creating Themes Required Software diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json index 4d68ed9..bb86050 100644 --- a/buildSrc/assets/templates/base.laf.template.json +++ b/buildSrc/assets/templates/base.laf.template.json @@ -18,7 +18,7 @@ "quickInput.list.focusBackground": "&selectionBackground&AA", "quickInput.foreground": "&foregroundColor&", "peekViewTitleLabel.foreground": "&foregroundColor&", - "selection.background": "&accentColor&", + "selection.background": "&selectionBackground&", "editorGutter.modifiedBackground": "&diff.modified&", "editorGutter.addedBackground": "&diff.inserted&", "editorGutter.deletedBackground": "&diff.deleted&", diff --git a/buildSrc/assets/themes/azurLane/essex/dark/essex.dark.vsCode.definition.json b/buildSrc/assets/themes/azurLane/essex/dark/essex.dark.vsCode.definition.json index 1cf7fe0..488b3e3 100644 --- a/buildSrc/assets/themes/azurLane/essex/dark/essex.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/azurLane/essex/dark/essex.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/charlotte/nao/light/nao.light.vsCode.definition.json b/buildSrc/assets/themes/charlotte/nao/light/nao.light.vsCode.definition.json index f3fb21a..b38e575 100644 --- a/buildSrc/assets/themes/charlotte/nao/light/nao.light.vsCode.definition.json +++ b/buildSrc/assets/themes/charlotte/nao/light/nao.light.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "light", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/franxx/hiro/dark/hiro.dark.vsCode.definition.json b/buildSrc/assets/themes/franxx/hiro/dark/hiro.dark.vsCode.definition.json index be4044f..8304a1b 100644 --- a/buildSrc/assets/themes/franxx/hiro/dark/hiro.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/franxx/hiro/dark/hiro.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.vsCode.definition.json b/buildSrc/assets/themes/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.vsCode.definition.json index de3b3d7..ccd255a 100644 --- a/buildSrc/assets/themes/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/franxx/hiroXZeroTwo/dark/hiro.x.zero.two.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/franxx/zeroTwo/obsidian/zero.two.obsidian.vsCode.definition.json b/buildSrc/assets/themes/franxx/zeroTwo/obsidian/zero.two.obsidian.vsCode.definition.json index aae7d7b..e575554 100644 --- a/buildSrc/assets/themes/franxx/zeroTwo/obsidian/zero.two.obsidian.vsCode.definition.json +++ b/buildSrc/assets/themes/franxx/zeroTwo/obsidian/zero.two.obsidian.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/franxx/zeroTwo/sakura/zero.two.sakura.vsCode.definition.json b/buildSrc/assets/themes/franxx/zeroTwo/sakura/zero.two.sakura.vsCode.definition.json index cb14401..fc5762e 100644 --- a/buildSrc/assets/themes/franxx/zeroTwo/sakura/zero.two.sakura.vsCode.definition.json +++ b/buildSrc/assets/themes/franxx/zeroTwo/sakura/zero.two.sakura.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "light", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/guiltyCrown/inori/light/inori.light.vsCode.definition.json b/buildSrc/assets/themes/guiltyCrown/inori/light/inori.light.vsCode.definition.json index 4800e34..947a732 100644 --- a/buildSrc/assets/themes/guiltyCrown/inori/light/inori.light.vsCode.definition.json +++ b/buildSrc/assets/themes/guiltyCrown/inori/light/inori.light.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "light", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vsCode.definition.json b/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vsCode.definition.json index 69d7a71..d13661f 100644 --- a/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/haikyu/shoyo/dark/shoyo.dark.vsCode.definition.json @@ -4,8 +4,7 @@ "laf": { "extends": "dark", "ui": { - "editor.selectionBackground": "&selectionBackground&", - "selection.background": "&selectionBackground&" + "editor.selectionBackground": "&selectionBackground&" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/killLaKill/satsuki/dark/satsuki.dark.vsCode.definition.json b/buildSrc/assets/themes/killLaKill/satsuki/dark/satsuki.dark.vsCode.definition.json index 2b4e1c1..484b892 100644 --- a/buildSrc/assets/themes/killLaKill/satsuki/dark/satsuki.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/killLaKill/satsuki/dark/satsuki.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/literature/monika/light/monika.light.vsCode.definition.json b/buildSrc/assets/themes/literature/monika/light/monika.light.vsCode.definition.json index 73d65f4..46a223e 100644 --- a/buildSrc/assets/themes/literature/monika/light/monika.light.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/monika/light/monika.light.vsCode.definition.json @@ -4,7 +4,7 @@ "laf": { "extends": "light", "ui": { - "editor.selectionBackground": "&selectionBackground&33" + "editor.selectionBackground": "&selectionBackground&66" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/literature/natsuki/light/natsuki.light.vsCode.definition.json b/buildSrc/assets/themes/literature/natsuki/light/natsuki.light.vsCode.definition.json index 86c38fd..058cd33 100644 --- a/buildSrc/assets/themes/literature/natsuki/light/natsuki.light.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/natsuki/light/natsuki.light.vsCode.definition.json @@ -7,7 +7,7 @@ "editor.lineHighlightBackground": "&headerColor&77", "sideBarSectionHeader.background": "&headerColor&", "activityBar.background": "&headerColor&", - "editor.selectionBackground": "&selectionBackground&33" + "editor.selectionBackground": "&selectionBackground&aa" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/literature/sayori/light/sayori.light.vsCode.definition.json b/buildSrc/assets/themes/literature/sayori/light/sayori.light.vsCode.definition.json index 89d5717..38eba91 100644 --- a/buildSrc/assets/themes/literature/sayori/light/sayori.light.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/sayori/light/sayori.light.vsCode.definition.json @@ -4,7 +4,7 @@ "laf": { "extends": "light", "ui": { - "editor.selectionBackground": "&selectionBackground&33" + "editor.selectionBackground": "&selectionBackground&aa" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vsCode.definition.json index 3148a1e..34eed93 100644 --- a/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vsCode.definition.json b/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vsCode.definition.json index 5fb6761..9a3d72f 100644 --- a/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vsCode.definition.json b/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vsCode.definition.json index fb451ea..8d88bfa 100644 --- a/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/onePunch/genos/dark/genos.dark.vsCode.definition.json @@ -4,8 +4,7 @@ "laf": { "extends": "dark-contrast", "ui": { - "editor.selectionBackground": "&selectionBackground&", - "selection.background": "&selectionBackground&" + "editor.selectionBackground": "&selectionBackground&" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/oreimo/kirino/dark/kirino.dark.vsCode.definition.json b/buildSrc/assets/themes/oreimo/kirino/dark/kirino.dark.vsCode.definition.json index 959c874..b8c4ce4 100644 --- a/buildSrc/assets/themes/oreimo/kirino/dark/kirino.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/oreimo/kirino/dark/kirino.dark.vsCode.definition.json @@ -4,8 +4,7 @@ "laf": { "extends": "dark", "ui": { - "editor.selectionBackground": "&selectionBackground&", - "selection.background": "&selectionBackground&" + "editor.selectionBackground": "&selectionBackground&" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/quintuplets/ichika/light/ichika.light.vsCode.definition.json b/buildSrc/assets/themes/quintuplets/ichika/light/ichika.light.vsCode.definition.json index 7edec52..aa33d08 100644 --- a/buildSrc/assets/themes/quintuplets/ichika/light/ichika.light.vsCode.definition.json +++ b/buildSrc/assets/themes/quintuplets/ichika/light/ichika.light.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "light", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/quintuplets/itsuki/light/itsuki.light.vsCode.definition.json b/buildSrc/assets/themes/quintuplets/itsuki/light/itsuki.light.vsCode.definition.json index 035d174..0c091aa 100644 --- a/buildSrc/assets/themes/quintuplets/itsuki/light/itsuki.light.vsCode.definition.json +++ b/buildSrc/assets/themes/quintuplets/itsuki/light/itsuki.light.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "light", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json b/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json index 7e8e3ae..a2c99ed 100644 --- a/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json +++ b/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json @@ -12,7 +12,7 @@ "scrollbarSlider.hoverBackground": "&accentColorSecondary&9A", "scrollbarSlider.background": "&accentColorSecondary&5A", "scrollbarSlider.activeBackground": "&accentColorSecondary&9A", - "editor.selectionBackground": "&selectionBackground&33" + "editor.selectionBackground": "&selectionBackground&aa" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json b/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json index 7cab271..4cc24c6 100644 --- a/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json +++ b/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json @@ -4,8 +4,7 @@ "laf": { "extends": "dark-contrast", "ui": { - "editor.selectionBackground": "&selectionBackground&88", - "selection.background": "&selectionBackground&" + "editor.selectionBackground": "&selectionBackground&88" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/senkoSan/senko/light/senko.light.vsCode.definition.json b/buildSrc/assets/themes/senkoSan/senko/light/senko.light.vsCode.definition.json index 452ef91..59c4a80 100644 --- a/buildSrc/assets/themes/senkoSan/senko/light/senko.light.vsCode.definition.json +++ b/buildSrc/assets/themes/senkoSan/senko/light/senko.light.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "light", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/slime/rimuru/dark/rimuru.dark.vsCode.definition.json b/buildSrc/assets/themes/slime/rimuru/dark/rimuru.dark.vsCode.definition.json index f5561a8..9d040b3 100644 --- a/buildSrc/assets/themes/slime/rimuru/dark/rimuru.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/slime/rimuru/dark/rimuru.dark.vsCode.definition.json @@ -4,8 +4,7 @@ "laf": { "extends": "dark-contrast", "ui": { - "editor.selectionBackground": "&selectionBackground&", - "selection.background": "&selectionBackground&" + "editor.selectionBackground": "&selectionBackground&" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/yuruCamp/nadeshiko/dark/nadeshiko.dark.vsCode.definition.json b/buildSrc/assets/themes/yuruCamp/nadeshiko/dark/nadeshiko.dark.vsCode.definition.json index 9d2e6c0..9ab0ec9 100644 --- a/buildSrc/assets/themes/yuruCamp/nadeshiko/dark/nadeshiko.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/yuruCamp/nadeshiko/dark/nadeshiko.dark.vsCode.definition.json @@ -3,9 +3,7 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": { - "selection.background": "&selectionBackground&" - } + "ui": {} }, "syntax": {}, "colors": {} diff --git a/buildSrc/src/MassModifier.ts b/buildSrc/src/MassModifier.ts index ae8bdaf..df0329e 100644 --- a/buildSrc/src/MassModifier.ts +++ b/buildSrc/src/MassModifier.ts @@ -4,7 +4,7 @@ import fs from "fs"; console.log(path.resolve('.')); -walkDir(path.resolve('.','assets','themes')) +walkDir(path.resolve('.', 'assets', 'themes')) .then((files) => files.filter((file) => file.endsWith("vsCode.definition.json")) ) .then((dokiFileDefinitionPaths) => { @@ -24,8 +24,8 @@ walkDir(path.resolve('.','assets','themes')) .then((defs) => { console.log( - Object.keys( - defs.map(a => a.dokiThemeDefinition.characterId).reduce((acc, id) => { + Object.keys( + defs.map(a => a.dokiThemeDefinition.characterId).reduce((acc, id) => { acc[id] = id; return acc; }, {})).length @@ -33,16 +33,18 @@ walkDir(path.resolve('.','assets','themes')) defs.forEach(({ dokiFileDefinitionPath, dokiThemeDefinition, - })=>{ - console.log(`${dokiThemeDefinition.id}: ${dokiThemeDefinition.laf?.ui?.['selection.background']}`); - - // delete dokiThemeDefinition.backgrounds; - // fs.writeFileSync( - // dokiFileDefinitionPath, - // JSON.stringify( - // dokiThemeDefinition, null, 2 + }) => { + const selectionBackground = dokiThemeDefinition.laf?.ui?.['selection.background']; + console.log(`${dokiThemeDefinition.id}: ${selectionBackground}`); + // if (selectionBackground === '&selectionBackground&') { + // delete dokiThemeDefinition.laf?.ui?.['selection.background']; + // fs.writeFileSync( + // dokiFileDefinitionPath, + // JSON.stringify( + // dokiThemeDefinition, null, 2 + // ) // ) - // ) + // } }); }); diff --git a/package.json b/package.json index 3b0d2b2..d762f06 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Doki Theme", "description": "Cute anime character themes!", "publisher": "unthrottled", - "version": "88.1.14", + "version": "88.1.15", "license": "MIT", "icon": "Doki-Theme-v2.png", "galleryBanner": { diff --git a/src/NotificationService.ts b/src/NotificationService.ts index fd6dafa..32fe598 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 = "v88.4-1.6.0"; +const DOKI_THEME_VERSION = "v88.5-1.6.1"; export function attemptToNotifyUpdates(context: vscode.ExtensionContext) { const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);