From 1c45722680b6bad2803acdc1384acb8503f300d3 Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Tue, 7 Jan 2020 14:38:05 +0100 Subject: [PATCH] Various schemes improvements...or not --- ...ial-Theme-Darker-High-Contrast-Legacy.json | 18 ++++---- .../themes/Material-Theme-Darker-Legacy.json | 33 +++++++++++---- ...al-Theme-Default-High-Contrast-Legacy.json | 18 ++++---- .../themes/Material-Theme-Default-Legacy.json | 18 ++++---- ...al-Theme-Lighter-High-Contrast-Legacy.json | 2 +- .../themes/Material-Theme-Lighter-Legacy.json | 2 +- ...rial-Theme-Ocean-High-Contrast-Legacy.json | 18 ++++---- .../themes/Material-Theme-Ocean-Legacy.json | 18 ++++---- ...-Theme-Palenight-High-Contrast-Legacy.json | 18 ++++---- .../Material-Theme-Palenight-Legacy.json | 18 ++++---- scripts/generator/color-set.ts | 41 ++++++++++++------- .../generator/settings/specific/darker-hc.ts | 4 +- scripts/generator/settings/specific/darker.ts | 4 +- .../generator/settings/specific/default-hc.ts | 4 +- .../generator/settings/specific/default.ts | 4 +- .../generator/settings/specific/lighter-hc.ts | 2 +- .../generator/settings/specific/lighter.ts | 2 +- .../generator/settings/specific/ocean-hc.ts | 4 +- scripts/generator/settings/specific/ocean.ts | 4 +- .../settings/specific/palenight-hc.ts | 4 +- .../generator/settings/specific/palenight.ts | 4 +- 21 files changed, 133 insertions(+), 107 deletions(-) diff --git a/legacy/themes/Material-Theme-Darker-High-Contrast-Legacy.json b/legacy/themes/Material-Theme-Darker-High-Contrast-Legacy.json index cd4244e..efe8e0c 100644 --- a/legacy/themes/Material-Theme-Darker-High-Contrast-Legacy.json +++ b/legacy/themes/Material-Theme-Darker-High-Contrast-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Darker-Legacy.json b/legacy/themes/Material-Theme-Darker-Legacy.json index 55526ab..8d24a34 100644 --- a/legacy/themes/Material-Theme-Darker-Legacy.json +++ b/legacy/themes/Material-Theme-Darker-Legacy.json @@ -116,6 +116,21 @@ "fontStyle": "italic" } }, + "base": { + "white": "#ffffff", + "black": "#000000", + "red": "#FF5370", + "orange": "#F78C6C", + "yellow": "#FFCB6B", + "green": "#C3E88D", + "cyan": "#89DDFF", + "blue": "#82AAFF", + "paleblue": "#B2CCD6", + "purple": "#C792EA", + "brown": "#916b53", + "pink": "#ff9cac", + "violet": "#bb80b3" + } { "name": "Tag", "scope": [ @@ -124,7 +139,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +160,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +169,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +179,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +450,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +468,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +544,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +570,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Default-High-Contrast-Legacy.json b/legacy/themes/Material-Theme-Default-High-Contrast-Legacy.json index 67d0122..bed38db 100644 --- a/legacy/themes/Material-Theme-Default-High-Contrast-Legacy.json +++ b/legacy/themes/Material-Theme-Default-High-Contrast-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Default-Legacy.json b/legacy/themes/Material-Theme-Default-Legacy.json index 590d2b7..dc1cc53 100644 --- a/legacy/themes/Material-Theme-Default-Legacy.json +++ b/legacy/themes/Material-Theme-Default-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Lighter-High-Contrast-Legacy.json b/legacy/themes/Material-Theme-Lighter-High-Contrast-Legacy.json index 4f0a51b..2ee3de1 100644 --- a/legacy/themes/Material-Theme-Lighter-High-Contrast-Legacy.json +++ b/legacy/themes/Material-Theme-Lighter-High-Contrast-Legacy.json @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { diff --git a/legacy/themes/Material-Theme-Lighter-Legacy.json b/legacy/themes/Material-Theme-Lighter-Legacy.json index 106e674..6a3e8be 100644 --- a/legacy/themes/Material-Theme-Lighter-Legacy.json +++ b/legacy/themes/Material-Theme-Lighter-Legacy.json @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { diff --git a/legacy/themes/Material-Theme-Ocean-High-Contrast-Legacy.json b/legacy/themes/Material-Theme-Ocean-High-Contrast-Legacy.json index ebeecb0..c67e5b3 100644 --- a/legacy/themes/Material-Theme-Ocean-High-Contrast-Legacy.json +++ b/legacy/themes/Material-Theme-Ocean-High-Contrast-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Ocean-Legacy.json b/legacy/themes/Material-Theme-Ocean-Legacy.json index 93dab96..778b1b3 100644 --- a/legacy/themes/Material-Theme-Ocean-Legacy.json +++ b/legacy/themes/Material-Theme-Ocean-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Palenight-High-Contrast-Legacy.json b/legacy/themes/Material-Theme-Palenight-High-Contrast-Legacy.json index 54c2e25..5bbf112 100644 --- a/legacy/themes/Material-Theme-Palenight-High-Contrast-Legacy.json +++ b/legacy/themes/Material-Theme-Palenight-High-Contrast-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/legacy/themes/Material-Theme-Palenight-Legacy.json b/legacy/themes/Material-Theme-Palenight-Legacy.json index c2636e5..bdb69eb 100644 --- a/legacy/themes/Material-Theme-Palenight-Legacy.json +++ b/legacy/themes/Material-Theme-Palenight-Legacy.json @@ -124,7 +124,7 @@ "markup.deleted.git_gutter" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -145,7 +145,7 @@ "source.cpp meta.block variable.other" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -154,7 +154,7 @@ "variable.other.constant" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -164,7 +164,7 @@ "string.other.link" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -435,7 +435,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#C17E70" + "foreground": "#916b53" } }, { @@ -453,7 +453,7 @@ "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" ], "settings": { - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -529,7 +529,7 @@ ], "settings": { "fontStyle": "italic", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -540,7 +540,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { @@ -555,7 +555,7 @@ ], "settings": { "fontStyle": "bold", - "foreground": "#f07178" + "foreground": "#ff9cac" } }, { diff --git a/scripts/generator/color-set.ts b/scripts/generator/color-set.ts index 4b76e2a..014c1f1 100644 --- a/scripts/generator/color-set.ts +++ b/scripts/generator/color-set.ts @@ -13,7 +13,7 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => { // Determines function, class, classMember, type, and cssTag color3: theme.scheme.base.yellow, // Determines functionCall and number - color4: theme.scheme.base.paleblue, + color4: theme.scheme.base.blue, // Determines the overall text foreground color foreground: theme.scheme.foreground }, @@ -23,28 +23,46 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => { */ syntax: { boolean: theme.scheme.base.pink, + storage: theme.scheme.base.purple, class: theme.scheme.base.purple, classMember: theme.scheme.base.red, comment: theme.scheme.comments, cssClass: theme.scheme.base.yellow, cssId: theme.scheme.base.orange, cssTag: theme.scheme.base.yellow, - function: theme.scheme.base.yellow, + function: theme.scheme.base.blue, functionCall: theme.scheme.base.blue, - identifier: theme.scheme.base.cyan, + number: theme.scheme.base.orange, + identifier: theme.scheme.foreground, keyword: theme.scheme.base.red, - storage: theme.scheme.foreground, string: theme.scheme.base.green, stringEscape: theme.scheme.foreground, - type: theme.scheme.base.pink + type: theme.scheme.base.yellow }, /** * Override all syntax tokens */ customTokens: [ + { + name: 'String', + scope: ['string.quoted'], + settings: { + foreground: theme.scheme.base.green + } + }, + { + name: 'Support Class', + scope: ['support.class.builtin'], + settings: { + foreground: theme.scheme.base.yellow + } + }, { name: 'Punctuation', - scope: ['punctuation.separator', 'punctuation.definition.string'], + scope: [ + 'punctuation.separator', + 'punctuation.definition.string' + ], settings: { foreground: theme.scheme.base.cyan } @@ -52,20 +70,13 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => { { name: 'Keyword, Storage', scope: [ - 'keyword', - 'storage' + 'keyword.control' ], settings: { + foreground: theme.scheme.base.cyan, fontStyle: 'italic' } }, - { - name: 'String', - scope: ['string.quoted'], - settings: { - foreground: theme.scheme.base.green - } - }, { name: 'JSON Key - Level 0', scope: [ diff --git a/scripts/generator/settings/specific/darker-hc.ts b/scripts/generator/settings/specific/darker-hc.ts index 338fce9..b4d0e0e 100644 --- a/scripts/generator/settings/specific/darker-hc.ts +++ b/scripts/generator/settings/specific/darker-hc.ts @@ -42,8 +42,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/darker.ts b/scripts/generator/settings/specific/darker.ts index cb6d21f..c882af5 100644 --- a/scripts/generator/settings/specific/darker.ts +++ b/scripts/generator/settings/specific/darker.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/default-hc.ts b/scripts/generator/settings/specific/default-hc.ts index 9313ba6..27e13cf 100644 --- a/scripts/generator/settings/specific/default-hc.ts +++ b/scripts/generator/settings/specific/default-hc.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/default.ts b/scripts/generator/settings/specific/default.ts index 5c5881e..8d1ccf2 100644 --- a/scripts/generator/settings/specific/default.ts +++ b/scripts/generator/settings/specific/default.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/lighter-hc.ts b/scripts/generator/settings/specific/lighter-hc.ts index 4977402..1c01ef6 100644 --- a/scripts/generator/settings/specific/lighter-hc.ts +++ b/scripts/generator/settings/specific/lighter-hc.ts @@ -44,7 +44,7 @@ export default { blue: '#6182B8', paleblue: '#8796B0', purple: '#7C4DFF', - brown: '#C17E70', + brown: '#916b53', pink: '#FF5370', violet: '#945EB8' } diff --git a/scripts/generator/settings/specific/lighter.ts b/scripts/generator/settings/specific/lighter.ts index 7cccc11..73ba2d2 100644 --- a/scripts/generator/settings/specific/lighter.ts +++ b/scripts/generator/settings/specific/lighter.ts @@ -44,7 +44,7 @@ export default { blue: '#6182B8', paleblue: '#8796B0', purple: '#7C4DFF', - brown: '#C17E70', + brown: '#916b53', pink: '#FF5370', violet: '#945EB8' } diff --git a/scripts/generator/settings/specific/ocean-hc.ts b/scripts/generator/settings/specific/ocean-hc.ts index 7a1a358..75df9b5 100644 --- a/scripts/generator/settings/specific/ocean-hc.ts +++ b/scripts/generator/settings/specific/ocean-hc.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/ocean.ts b/scripts/generator/settings/specific/ocean.ts index ab588db..00d6748 100644 --- a/scripts/generator/settings/specific/ocean.ts +++ b/scripts/generator/settings/specific/ocean.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/palenight-hc.ts b/scripts/generator/settings/specific/palenight-hc.ts index 7004075..1078f72 100644 --- a/scripts/generator/settings/specific/palenight-hc.ts +++ b/scripts/generator/settings/specific/palenight-hc.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } } diff --git a/scripts/generator/settings/specific/palenight.ts b/scripts/generator/settings/specific/palenight.ts index 470a5d4..fda5260 100644 --- a/scripts/generator/settings/specific/palenight.ts +++ b/scripts/generator/settings/specific/palenight.ts @@ -44,8 +44,8 @@ export default { blue: '#82AAFF', paleblue: '#B2CCD6', purple: '#C792EA', - brown: '#C17E70', - pink: '#f07178', + brown: '#916b53', + pink: '#ff9cac', violet: '#bb80b3' } }