From b856d5bfb3e063c72ed8645d8a621c62a5d99d19 Mon Sep 17 00:00:00 2001 From: DATBOI Date: Thu, 6 May 2021 06:09:03 -0500 Subject: [PATCH 1/5] Working on fixing selection backgrounds --- buildSrc/assets/templates/dark.dim.laf.template.json | 7 +++++++ .../bunnySenpai/mai/dark/mai.dark.vsCode.definition.json | 4 +++- .../themes/miscellaneous/miku/miku.vsCode.definition.json | 7 ++++++- .../quintuplets/miku/dark/miku.dark.vsCode.definition.json | 2 +- buildSrc/src/BuildThemes.ts | 6 +++--- 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 buildSrc/assets/templates/dark.dim.laf.template.json diff --git a/buildSrc/assets/templates/dark.dim.laf.template.json b/buildSrc/assets/templates/dark.dim.laf.template.json new file mode 100644 index 0000000..04da23d --- /dev/null +++ b/buildSrc/assets/templates/dark.dim.laf.template.json @@ -0,0 +1,7 @@ +{ + "name":"dark-dim", + "extends":"dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&66" + } +} \ 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 9e40e16..b122ede 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 @@ -3,7 +3,9 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": {} + "ui": { + "editor.selectionBackground": "&selectionBackground&99" + } }, "syntax": {}, "colors": {}, diff --git a/buildSrc/assets/themes/miscellaneous/miku/miku.vsCode.definition.json b/buildSrc/assets/themes/miscellaneous/miku/miku.vsCode.definition.json index 168bbf4..de965aa 100644 --- a/buildSrc/assets/themes/miscellaneous/miku/miku.vsCode.definition.json +++ b/buildSrc/assets/themes/miscellaneous/miku/miku.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "bc12b380-1f2a-4a9d-89d8-388a07f1e15f", "overrides": {}, - "laf": {}, + "laf": { + "extends": "dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&66" + } + }, "syntax": {}, "backgrounds": { "secondary": { diff --git a/buildSrc/assets/themes/quintuplets/miku/dark/miku.dark.vsCode.definition.json b/buildSrc/assets/themes/quintuplets/miku/dark/miku.dark.vsCode.definition.json index 37cd517..4c5aace 100644 --- a/buildSrc/assets/themes/quintuplets/miku/dark/miku.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/quintuplets/miku/dark/miku.dark.vsCode.definition.json @@ -2,7 +2,7 @@ "id": "d96c6599-ebf8-4359-ae26-19f79b69e919", "overrides": {}, "laf": { - "extends": "dark-contrast", + "extends": "dark-contrast,dark-dim", "ui": { } }, diff --git a/buildSrc/src/BuildThemes.ts b/buildSrc/src/BuildThemes.ts index c6a692a..3e1623c 100644 --- a/buildSrc/src/BuildThemes.ts +++ b/buildSrc/src/BuildThemes.ts @@ -5,7 +5,7 @@ import { resolveNamedColors, BaseAppDokiThemeDefinition, DokiThemeDefinitions, - resolveTemplate, + composeTemplate, resolveColor, applyNamedColors, SYNTAX_TYPE, @@ -54,11 +54,11 @@ function buildLAFColors( ? lafTemplates.dark : lafTemplates.light; - const resolvedLafTemplate = resolveTemplate( + const resolvedLafTemplate = composeTemplate( lafTemplate, lafTemplates, (template) => template.ui, - (template) => template.extends + (template) => template.extends?.split(',') || [] ); const resolvedNamedColors = resolveNamedColors( From 8e7667b1b7e464c73c7693623a2836ec464f0ba8 Mon Sep 17 00:00:00 2001 From: DATBOI Date: Fri, 7 May 2021 06:05:02 -0500 Subject: [PATCH 2/5] Revisited all the selection colors --- .../ibuki/light/ibuki.light.vsCode.definition.json | 7 ++++++- .../tohru/light/tohru.light.vsCode.definition.json | 7 ++++++- .../eva/misato/dark/misato.dark.vsCode.definition.json | 1 + .../themes/eva/rei/dark/rei.dark.vsCode.definition.json | 7 ++++++- .../fate/ishtar/dark/ishtar.dark.vsCode.definition.json | 4 +++- .../zeroTwo/dark/zero.two.dark.vsCode.definition.json | 4 +++- .../zeroTwo/light/zero.two.light.vsCode.definition.json | 7 ++++++- .../rias/dark/rias.dark.vsCode.definition.json | 7 ++++++- .../themes/killLaKill/ryuko/ryuko.vsCode.definition.json | 1 + .../killLaKill/satsuki/satsuki.vsCode.definition.json | 7 ++++++- .../konoSuba/aqua/dark/aqua.dark.vsCode.definition.json | 7 ++++++- .../darkness/dark/darkness.dark.vsCode.definition.json | 1 + .../assets/themes/konoSuba/megumin.vsCode.definition.json | 1 + .../monika/dark/monika.dark.vsCode.definition.json | 1 + .../monika/light/monika.light.vsCode.definition.json | 7 ++++++- .../natsuki/dark/natsuki.dark.vsCode.definition.json | 3 ++- .../natsuki/light/natsuki.light.vsCode.definition.json | 3 ++- .../sayori/dark/sayori.dark.vsCode.definition.json | 7 ++++++- .../sayori/light/sayori.light.vsCode.definition.json | 7 ++++++- .../yuri/light/yuri.light.vsCode.definition.json | 7 ++++++- .../miia/dark/miia.dark.vsCode.definition.json | 1 + .../yukino/dark/yukino.dark.vsCode.definition.json | 1 + .../themes/reZero/beatrice/beatrice.vsCode.definition.json | 3 ++- .../emilia/light/emilia.light.vsCode.definition.json | 7 ++++++- .../assets/themes/reZero/ram/ram.vsCode.definition.json | 4 +++- .../assets/themes/reZero/rem/rem.vsCode.definition.json | 7 ++++++- .../asuna/light/asuna.light.vsCode.definition.json | 7 ++++++- 27 files changed, 106 insertions(+), 20 deletions(-) diff --git a/buildSrc/assets/themes/danganronpa/ibuki/light/ibuki.light.vsCode.definition.json b/buildSrc/assets/themes/danganronpa/ibuki/light/ibuki.light.vsCode.definition.json index 8e4bffd..5b8ef19 100644 --- a/buildSrc/assets/themes/danganronpa/ibuki/light/ibuki.light.vsCode.definition.json +++ b/buildSrc/assets/themes/danganronpa/ibuki/light/ibuki.light.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "697e8564-0975-4907-a34c-51f65177ebf3", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&55" + } + }, "syntax": {}, "colors": {}, "backgrounds": { diff --git a/buildSrc/assets/themes/dragonMaid/tohru/light/tohru.light.vsCode.definition.json b/buildSrc/assets/themes/dragonMaid/tohru/light/tohru.light.vsCode.definition.json index c658688..80234f8 100644 --- a/buildSrc/assets/themes/dragonMaid/tohru/light/tohru.light.vsCode.definition.json +++ b/buildSrc/assets/themes/dragonMaid/tohru/light/tohru.light.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "2d049451-6e89-4325-af38-6ce889991e5b", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&55" + } + }, "syntax": {}, "backgrounds": { "default": { diff --git a/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json b/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json index 8aa3b94..8b73fa9 100644 --- a/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark", "ui": { + "editor.selectionBackground": "&selectionBackground&88", "quickInput.foreground": "&keywordColor&" } }, diff --git a/buildSrc/assets/themes/eva/rei/dark/rei.dark.vsCode.definition.json b/buildSrc/assets/themes/eva/rei/dark/rei.dark.vsCode.definition.json index be5f7f9..c182781 100644 --- a/buildSrc/assets/themes/eva/rei/dark/rei.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/eva/rei/dark/rei.dark.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "c262185d-9682-413b-9143-85a2dda76b2f", "overrides": {}, - "laf": {}, + "laf": { + "extends": "dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&88" + } + }, "syntax": {}, "colors": {}, "backgrounds": { diff --git a/buildSrc/assets/themes/fate/ishtar/dark/ishtar.dark.vsCode.definition.json b/buildSrc/assets/themes/fate/ishtar/dark/ishtar.dark.vsCode.definition.json index 9633a44..1b58889 100644 --- a/buildSrc/assets/themes/fate/ishtar/dark/ishtar.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/fate/ishtar/dark/ishtar.dark.vsCode.definition.json @@ -3,7 +3,9 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": {} + "ui": { + "editor.selectionBackground": "&selectionBackground&88" + } }, "syntax": {}, "colors": { 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 dc14dd2..63c37e6 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 @@ -3,7 +3,9 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": {} + "ui": { + "editor.selectionBackground": "&selectionBackground&66" + } }, "syntax": {}, "colors": {} diff --git a/buildSrc/assets/themes/franxx/zeroTwo/light/zero.two.light.vsCode.definition.json b/buildSrc/assets/themes/franxx/zeroTwo/light/zero.two.light.vsCode.definition.json index b7515d9..388c0fa 100644 --- a/buildSrc/assets/themes/franxx/zeroTwo/light/zero.two.light.vsCode.definition.json +++ b/buildSrc/assets/themes/franxx/zeroTwo/light/zero.two.light.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "4fd5cb34-d36e-4a3c-8639-052b19b26ba1", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&55" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file diff --git a/buildSrc/assets/themes/highSchoolDxD/rias/dark/rias.dark.vsCode.definition.json b/buildSrc/assets/themes/highSchoolDxD/rias/dark/rias.dark.vsCode.definition.json index e2f904f..7bc59d4 100644 --- a/buildSrc/assets/themes/highSchoolDxD/rias/dark/rias.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/highSchoolDxD/rias/dark/rias.dark.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597", "overrides": {}, - "laf": {}, + "laf": { + "extends": "dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&45" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file diff --git a/buildSrc/assets/themes/killLaKill/ryuko/ryuko.vsCode.definition.json b/buildSrc/assets/themes/killLaKill/ryuko/ryuko.vsCode.definition.json index c7037ec..3d23d9c 100644 --- a/buildSrc/assets/themes/killLaKill/ryuko/ryuko.vsCode.definition.json +++ b/buildSrc/assets/themes/killLaKill/ryuko/ryuko.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark", "ui": { + "editor.selectionBackground": "&selectionBackground&88", "quickInput.foreground": "&foregroundColor&" } }, diff --git a/buildSrc/assets/themes/killLaKill/satsuki/satsuki.vsCode.definition.json b/buildSrc/assets/themes/killLaKill/satsuki/satsuki.vsCode.definition.json index a05f872..0948cc2 100644 --- a/buildSrc/assets/themes/killLaKill/satsuki/satsuki.vsCode.definition.json +++ b/buildSrc/assets/themes/killLaKill/satsuki/satsuki.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "3a78b13e-dbf2-410f-bb20-12b57bff7735", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&44" + } + }, "syntax": {}, "colors": { "selectionBackground": "#b7bcda" diff --git a/buildSrc/assets/themes/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json b/buildSrc/assets/themes/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json index 1ffcbc7..0420d9a 100644 --- a/buildSrc/assets/themes/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/konoSuba/aqua/dark/aqua.dark.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "15e51483-1ccd-46b7-90cf-885cccaaaf2c", "overrides": {}, - "laf": {}, + "laf": { + "extends": "dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&66" + } + }, "syntax": {}, "colors": { "constantsColor": "&secondaryAccentColor&" diff --git a/buildSrc/assets/themes/konoSuba/darkness/dark/darkness.dark.vsCode.definition.json b/buildSrc/assets/themes/konoSuba/darkness/dark/darkness.dark.vsCode.definition.json index 4d633bb..6858076 100644 --- a/buildSrc/assets/themes/konoSuba/darkness/dark/darkness.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/konoSuba/darkness/dark/darkness.dark.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark-contrast", "ui": { + "editor.selectionBackground": "&selectionBackground&88", "quickInput.foreground": "&foregroundColor&" } }, diff --git a/buildSrc/assets/themes/konoSuba/megumin.vsCode.definition.json b/buildSrc/assets/themes/konoSuba/megumin.vsCode.definition.json index 448e894..b027b9b 100644 --- a/buildSrc/assets/themes/konoSuba/megumin.vsCode.definition.json +++ b/buildSrc/assets/themes/konoSuba/megumin.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark", "ui": { + "editor.selectionBackground": "&selectionBackground&88", "quickInput.foreground": "&foregroundColor&" } }, diff --git a/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json b/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json index 4ed57d5..90a79ed 100644 --- a/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark", "ui": { + "editor.selectionBackground": "&selectionBackground&88", "quickInput.foreground": "&classNameColor&" } }, 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 17d62f5..73d65f4 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 @@ -1,7 +1,12 @@ { "id": "9a310731-ab2d-40f5-b502-fa5419f799a2", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&33" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file diff --git a/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json b/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json index 91efbc0..82565ae 100644 --- a/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json @@ -4,7 +4,8 @@ "laf": { "extends": "dark", "ui": { - "quickInput.foreground": "&classNameColor&" + "quickInput.foreground": "&classNameColor&", + "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 aae7dd2..51f4c3a 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 @@ -6,7 +6,8 @@ "ui": { "editor.lineHighlightBackground": "&headerColor&77", "sideBarSectionHeader.background": "&headerColor&", - "activityBar.background": "&headerColor&" + "activityBar.background": "&headerColor&", + "editor.selectionBackground": "&selectionBackground&33" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/literature/sayori/dark/sayori.dark.vsCode.definition.json b/buildSrc/assets/themes/literature/sayori/dark/sayori.dark.vsCode.definition.json index 8293285..6745072 100644 --- a/buildSrc/assets/themes/literature/sayori/dark/sayori.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/sayori/dark/sayori.dark.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "b0340303-0a5a-4a20-9b9c-fc8ce9880078", "overrides": {}, - "laf": {}, + "laf": { + "extends": "dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&88" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file 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 8ebf81c..89d5717 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 @@ -1,7 +1,12 @@ { "id": "cb8ef4b7-0844-4a04-b08b-754086598de4", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&33" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file diff --git a/buildSrc/assets/themes/literature/yuri/light/yuri.light.vsCode.definition.json b/buildSrc/assets/themes/literature/yuri/light/yuri.light.vsCode.definition.json index b984dd2..27df84f 100644 --- a/buildSrc/assets/themes/literature/yuri/light/yuri.light.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/yuri/light/yuri.light.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "cecf3f92-76d4-4f14-9a9c-3d558b6b3b68", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&33" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file diff --git a/buildSrc/assets/themes/monsterGirls/miia/dark/miia.dark.vsCode.definition.json b/buildSrc/assets/themes/monsterGirls/miia/dark/miia.dark.vsCode.definition.json index 8695d00..0f316e0 100644 --- a/buildSrc/assets/themes/monsterGirls/miia/dark/miia.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/monsterGirls/miia/dark/miia.dark.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark-contrast", "ui": { + "editor.selectionBackground": "&selectionBackground&88" } }, "backgrounds": { diff --git a/buildSrc/assets/themes/oreGairu/yukino/dark/yukino.dark.vsCode.definition.json b/buildSrc/assets/themes/oreGairu/yukino/dark/yukino.dark.vsCode.definition.json index 5f96253..4ab9407 100644 --- a/buildSrc/assets/themes/oreGairu/yukino/dark/yukino.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/oreGairu/yukino/dark/yukino.dark.vsCode.definition.json @@ -4,6 +4,7 @@ "laf": { "extends": "dark", "ui": { + "editor.selectionBackground": "&selectionBackground&AA", "quickInput.foreground": "&foregroundColor&" } }, diff --git a/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json b/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json index 6932e80..6cbee38 100644 --- a/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json +++ b/buildSrc/assets/themes/reZero/beatrice/beatrice.vsCode.definition.json @@ -11,7 +11,8 @@ "editorLineNumber.activeForeground": "&accentColorDarker&", "scrollbarSlider.hoverBackground": "&accentColorSecondary&9A", "scrollbarSlider.background": "&accentColorSecondary&5A", - "scrollbarSlider.activeBackground": "&accentColorSecondary&9A" + "scrollbarSlider.activeBackground": "&accentColorSecondary&9A", + "editor.selectionBackground": "&selectionBackground&33" } }, "syntax": {}, diff --git a/buildSrc/assets/themes/reZero/emilia/light/emilia.light.vsCode.definition.json b/buildSrc/assets/themes/reZero/emilia/light/emilia.light.vsCode.definition.json index 49079b1..53f85d7 100644 --- a/buildSrc/assets/themes/reZero/emilia/light/emilia.light.vsCode.definition.json +++ b/buildSrc/assets/themes/reZero/emilia/light/emilia.light.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "e828aaae-aa8c-4084-8993-d64697146930", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&33" + } + }, "syntax": {}, "colors": {}, "backgrounds": { diff --git a/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json b/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json index 6088b8a..77506fa 100644 --- a/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json +++ b/buildSrc/assets/themes/reZero/ram/ram.vsCode.definition.json @@ -3,7 +3,9 @@ "overrides": {}, "laf": { "extends": "dark-contrast", - "ui": {} + "ui": { + "editor.selectionBackground": "&selectionBackground&88" + } }, "syntax": {}, "colors": {}, diff --git a/buildSrc/assets/themes/reZero/rem/rem.vsCode.definition.json b/buildSrc/assets/themes/reZero/rem/rem.vsCode.definition.json index e3e44d1..c80502c 100644 --- a/buildSrc/assets/themes/reZero/rem/rem.vsCode.definition.json +++ b/buildSrc/assets/themes/reZero/rem/rem.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "f770dcfc-f41e-4b49-aa17-66e9ffc208fd", "overrides": {}, - "laf": {}, + "laf": { + "extends": "dark", + "ui": { + "editor.selectionBackground": "&selectionBackground&88" + } + }, "syntax": {}, "colors": {}, "backgrounds": { diff --git a/buildSrc/assets/themes/swordArtOnline/asuna/light/asuna.light.vsCode.definition.json b/buildSrc/assets/themes/swordArtOnline/asuna/light/asuna.light.vsCode.definition.json index 6bc2548..873ce01 100644 --- a/buildSrc/assets/themes/swordArtOnline/asuna/light/asuna.light.vsCode.definition.json +++ b/buildSrc/assets/themes/swordArtOnline/asuna/light/asuna.light.vsCode.definition.json @@ -1,7 +1,12 @@ { "id": "546e8fb8-6082-4ef5-a5e3-44790686f02f", "overrides": {}, - "laf": {}, + "laf": { + "extends": "light", + "ui": { + "editor.selectionBackground": "&selectionBackground&55" + } + }, "syntax": {}, "colors": {} } \ No newline at end of file From 3db7655e4607aa4d53c4f587ce254f2d9730e24e Mon Sep 17 00:00:00 2001 From: DATBOI Date: Fri, 7 May 2021 06:15:46 -0500 Subject: [PATCH 3/5] Reverted glass pane quickinput --- buildSrc/assets/templates/base.laf.template.json | 3 +-- .../eva/misato/dark/misato.dark.vsCode.definition.json | 5 ++--- .../highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json | 3 +-- .../monika/dark/monika.dark.vsCode.definition.json | 5 ++--- .../natsuki/dark/natsuki.dark.vsCode.definition.json | 3 +-- .../literature/yuri/dark/yuri.dark.vsCode.definition.json | 1 - 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json index 0f810b4..4ee0c3a 100644 --- a/buildSrc/assets/templates/base.laf.template.json +++ b/buildSrc/assets/templates/base.laf.template.json @@ -11,8 +11,7 @@ "peekViewResult.background": "&secondaryBackground&", "list.focusBackground": "&selectionBackground&", "quickInput.list.focusBackground": "&selectionBackground&AA", - "quickInput.background": "&headerColor&80", - "quickInput.foreground": "&infoForeground&", + "quickInput.foreground": "&foregroundColor&", "selection.background": "&accentColor&", "list.activeSelectionBackground": "&selectionBackground&", "peekViewResult.selectionBackground": "&selectionBackground&", diff --git a/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json b/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json index 8b73fa9..68d5950 100644 --- a/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/eva/misato/dark/misato.dark.vsCode.definition.json @@ -4,8 +4,7 @@ "laf": { "extends": "dark", "ui": { - "editor.selectionBackground": "&selectionBackground&88", - "quickInput.foreground": "&keywordColor&" + "editor.selectionBackground": "&selectionBackground&88" } }, "syntax": {}, @@ -13,4 +12,4 @@ "selectionBackground": "#5a293f", "selectionInactive": "#4b283c" } -} \ No newline at end of file +} diff --git a/buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json b/buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json index a2abfc7..fad7204 100644 --- a/buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json +++ b/buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.vsCode.definition.json @@ -4,9 +4,8 @@ "laf": { "extends": "dark", "ui": { - "quickInput.foreground": "&keywordColor&" } }, "syntax": {}, "colors": {} -} \ No newline at end of file +} diff --git a/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json b/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json index 90a79ed..e21c7b0 100644 --- a/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/monika/dark/monika.dark.vsCode.definition.json @@ -4,10 +4,9 @@ "laf": { "extends": "dark", "ui": { - "editor.selectionBackground": "&selectionBackground&88", - "quickInput.foreground": "&classNameColor&" + "editor.selectionBackground": "&selectionBackground&88" } }, "syntax": {}, "colors": {} -} \ No newline at end of file +} diff --git a/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json b/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json index 82565ae..9d1c9e3 100644 --- a/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/natsuki/dark/natsuki.dark.vsCode.definition.json @@ -4,7 +4,6 @@ "laf": { "extends": "dark", "ui": { - "quickInput.foreground": "&classNameColor&", "editor.selectionBackground": "&selectionBackground&66" } }, @@ -15,4 +14,4 @@ "anchor": "right" } } -} \ No newline at end of file +} diff --git a/buildSrc/assets/themes/literature/yuri/dark/yuri.dark.vsCode.definition.json b/buildSrc/assets/themes/literature/yuri/dark/yuri.dark.vsCode.definition.json index 77f5ea2..e74059f 100644 --- a/buildSrc/assets/themes/literature/yuri/dark/yuri.dark.vsCode.definition.json +++ b/buildSrc/assets/themes/literature/yuri/dark/yuri.dark.vsCode.definition.json @@ -4,7 +4,6 @@ "laf": { "extends": "dark", "ui": { - "quickInput.foreground": "&classNameColor&" } }, "syntax": {}, From 634eab2e28b7bcca708153577b7d1e7e14e48be1 Mon Sep 17 00:00:00 2001 From: DATBOI Date: Fri, 7 May 2021 19:26:41 -0500 Subject: [PATCH 4/5] Updated editor selection background --- buildSrc/assets/templates/base.laf.template.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json index 4ee0c3a..8d4d9ba 100644 --- a/buildSrc/assets/templates/base.laf.template.json +++ b/buildSrc/assets/templates/base.laf.template.json @@ -16,6 +16,7 @@ "list.activeSelectionBackground": "&selectionBackground&", "peekViewResult.selectionBackground": "&selectionBackground&", "list.hoverBackground": "&selectionBackground&2A", + "editor.selectionHighlightBackground": "&identifierHighlight&", "editor.selectionBackground": "&selectionBackground&", "minimap.selectionHighlight": "&selectionBackground&", "list.activeSelectionForeground": "&selectionForeground&", @@ -55,7 +56,7 @@ "titleBar.border": "&borderColor&", "notificationCenter.border": "&borderColor&", "notifications.border": "&borderColor&", - "editorCursor.background": "&textEditorBackground&", + "editorCursor.background": "&accentContrastColor&", "terminalCursor.background": "&textEditorBackground&", "editorSuggestWidget.border": "&textEditorBackground&", "panel.background": "&textEditorBackground&", From a298b2d465bd39f2f2771eabc711174cc8934f14 Mon Sep 17 00:00:00 2001 From: DATBOI Date: Sat, 8 May 2021 14:34:39 -0500 Subject: [PATCH 5/5] Updated changelog and bumped version to v12.1.0 --- CHANGELOG.md | 6 +++++- README.md | 11 ---------- package.json | 44 +++++++++++++++++++------------------- src/NotificationService.ts | 2 +- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 056e91f..a8ae70b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # Change Log -# 12.0.0 [Nino, Nakano Miku, Gray, & Tohru] +# 12.1.0 [Usability Updates] + +- Fixed selection usability issues for all themes [#68](https://github.com/doki-theme/doki-theme-vscode/issues/68) +- Changed the quick input panel to be opaque again. If you want it to be transparent, feel free to customize the [quick picker colors](https://code.visualstudio.com/api/references/theme-color#quick-picker-colors). I left the blurred effect on when you've installed the wallpaper. +# 12.0.0 [Nino, Nakano Miku, Gray, & Tohru] ## 5 New Themes From the Quintessential Quintuplets series: diff --git a/README.md b/README.md index 3a6d78b..e14f244 100644 --- a/README.md +++ b/README.md @@ -76,17 +76,6 @@ This feature will set the background image to the current theme's official wallp ![Zero Two Code](./readmeStuff/wallpaper_code.png) ![Zero Two Code](./readmeStuff/wallpaper_background.png) -**Quick Input Usability** - -Inorder to create a more immersive weeb experience, some panels have become see-through. -This causes some usability issues, however installing your theme's wallpaper fixes that problem. - -| Before | After | -| --- | --- | -| ![not usable](./readmeStuff/unusable_quickinput.png) | ![usable](./readmeStuff/useable_quickinput.png) - -> Note: colors can be adjusted using the [Quick picker colors](https://code.visualstudio.com/api/references/theme-color#quick-picker-colors) - ## Stickers **Show sticker** allows you to control the presence of the cute sticker in the bottom right-hand corner of your IDE. diff --git a/package.json b/package.json index 146a1fa..bd55dda 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.0.0", + "version": "12.1.0", "license": "MIT", "icon": "Doki-Theme.png", "galleryBanner": { @@ -694,12 +694,6 @@ "path": "./generatedThemes/Mai Light.theme.json", "uiTheme": "vs" }, - { - "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3", - "label": "Doki Theme: DDLC: Monika", - "path": "./generatedThemes/Monika Dark.theme.json", - "uiTheme": "vs-dark" - }, { "id": "9a310731-ab2d-40f5-b502-fa5419f799a2", "label": "Doki Theme: DDLC: Monika", @@ -707,9 +701,9 @@ "uiTheme": "vs" }, { - "id": "a7e0aa28-739a-4671-80ae-3980997e6b71", - "label": "Doki Theme: DDLC: Natsuki", - "path": "./generatedThemes/Natsuki Dark.theme.json", + "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3", + "label": "Doki Theme: DDLC: Monika", + "path": "./generatedThemes/Monika Dark.theme.json", "uiTheme": "vs-dark" }, { @@ -718,6 +712,12 @@ "path": "./generatedThemes/Natsuki Light.theme.json", "uiTheme": "vs" }, + { + "id": "a7e0aa28-739a-4671-80ae-3980997e6b71", + "label": "Doki Theme: DDLC: Natsuki", + "path": "./generatedThemes/Natsuki Dark.theme.json", + "uiTheme": "vs-dark" + }, { "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": "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": "a14733d6-8e15-4e75-b6b8-509f323e5b3b", + "label": "Doki Theme: DDLC: Yuri", + "path": "./generatedThemes/Yuri Dark.theme.json", + "uiTheme": "vs-dark" + }, { "id": "b93ab4ea-ff96-4459-8fa2-0caae5bc7116", "label": "Doki Theme: DM: Kanna", @@ -826,18 +826,18 @@ "path": "./generatedThemes/Aqua.theme.json", "uiTheme": "vs-dark" }, - { - "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": "774ec7ad-d6a0-4d9c-b195-2f54d72ab664", + "label": "Doki Theme: KonoSuba: Darkness", + "path": "./generatedThemes/Darkness Dark.theme.json", + "uiTheme": "vs-dark" + }, { "id": "63fe4617-4cac-47a5-9b93-6794514c35ad", "label": "Doki Theme: KonoSuba: Megumin", diff --git a/src/NotificationService.ts b/src/NotificationService.ts index 70f6fab..568d2c1 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.0.0"; +const DOKI_THEME_VERSION = "v12.1.0"; export function attemptToNotifyUpdates(context: vscode.ExtensionContext) { const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);