From 5e612d8c04826b0e0be515ded285c8cd99f3171d Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Fri, 5 May 2017 17:48:22 +0200 Subject: [PATCH] try to use commons colors --- .gulp/tasks/themes.js | 2 +- src/themes/settings/commons.json | 167 +------------------- src/themes/settings/specific/darker.json | 3 - src/themes/settings/specific/default.json | 3 - src/themes/settings/specific/lighter.json | 3 - src/themes/settings/specific/palenight.json | 3 - src/themes/theme-template-color-theme.json | 10 +- themes/Material-Theme-Darker.json | 10 +- themes/Material-Theme-Default.json | 10 +- themes/Material-Theme-Lighter.json | 10 +- themes/Material-Theme-Palenight.json | 10 +- 11 files changed, 32 insertions(+), 199 deletions(-) diff --git a/.gulp/tasks/themes.js b/.gulp/tasks/themes.js index 7a1af6a..0d394de 100644 --- a/.gulp/tasks/themes.js +++ b/.gulp/tasks/themes.js @@ -35,7 +35,7 @@ files.forEach(file => { gulp.task('build:themes', cb => { themeVariants.forEach(variant => { const templateData = { - commons: themeCommons, + 'commons': themeCommons, variant, }; diff --git a/src/themes/settings/commons.json b/src/themes/settings/commons.json index bacb6f7..8448bf0 100644 --- a/src/themes/settings/commons.json +++ b/src/themes/settings/commons.json @@ -1,164 +1,9 @@ { - "author": "Mattia Astorino", - "comment": "The most epic theme now for Visual Studio Code", - "colors": { - "basics": [ - { - "white": "#FFFFFFF", - "black": "#000000" - } - ], - "accents": [ - { - "id": "lime", - "name": "Lime", - "hex": "#7CB342", - "rgb": "124, 179, 66", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "purple", - "name": "Purple", - "hex": "#AB47BC", - "rgb": "171, 71, 188", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - }, - { - "id": "red", - "name": "Red", - "hex": "#E57373", - "rgb": "229, 115, 115", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "orange", - "name": "Orange", - "hex": "#FF7042", - "rgb": "255, 112, 66", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "yellow", - "name": "Yellow", - "hex": "#FFA000", - "rgb": "255, 160, 0", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "indigo", - "name": "Indigo", - "hex": "#5C6BC0", - "rgb": "92, 107, 192", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - }, - { - "id": "pink", - "name": "Pink", - "hex": "#FF4081", - "rgb": "255, 64, 129", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - }, - { - "id": "blue", - "name": "Blue", - "hex": "#2979FF", - "rgb": "41, 121, 255", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - }, - { - "id": "cyan", - "name": "Cyan", - "hex": "#00BCD4", - "rgb": "0, 188, 212", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "bright-teal", - "name": "Bright Teal", - "hex": "#64FFDA", - "rgb": "100, 255, 218", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "acid-lime", - "name": "Acid Lime", - "hex": "#C6FF00", - "rgb": "198, 255, 0", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "graphite", - "name": "Graphite", - "hex": "#616161", - "rgb": "97, 97, 97", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - }, - { - "id": "brba", - "name": "Breaking Bad", - "hex": "#388E3C", - "rgb": "56, 142, 60", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - }, - { - "id": "sky", - "name": "Sky", - "hex": "#84FFFF", - "rgb": "132, 255, 255", - "foreground": { - "hex": "#000000", - "rgb": "0, 0, 0" - } - }, - { - "id": "tomato", - "name": "Tomato", - "hex": "#F44336", - "rgb": "244, 67, 54", - "foreground": { - "hex": "#FFFFFF", - "rgb": "255, 255, 255" - } - } - ] + "accents": [{ + "teal": { + "id": "teal", + "name": "Teal", + "hex": "#80CBC4" } + }] } \ No newline at end of file diff --git a/src/themes/settings/specific/darker.json b/src/themes/settings/specific/darker.json index 9191523..e23dafd 100644 --- a/src/themes/settings/specific/darker.json +++ b/src/themes/settings/specific/darker.json @@ -19,9 +19,6 @@ "inputBorder": "#FFFFFF10", "scrollbars": "#00000050", "scrollbarsHover": "#00000030", - "accents": { - "teal": "#80CBC4" - }, "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/default.json b/src/themes/settings/specific/default.json index ccc7d5e..b00ac76 100644 --- a/src/themes/settings/specific/default.json +++ b/src/themes/settings/specific/default.json @@ -19,9 +19,6 @@ "inputBorder": "#FFFFFF10", "scrollbars": "#00000050", "scrollbarsHover": "#00000030", - "accents": { - "teal": "#80CBC4" - }, "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/lighter.json b/src/themes/settings/specific/lighter.json index 35880c9..4efbb74 100644 --- a/src/themes/settings/specific/lighter.json +++ b/src/themes/settings/specific/lighter.json @@ -19,9 +19,6 @@ "inputBorder": "#00000010", "scrollbars": "#00000050", "scrollbarsHover": "#00000030", - "accents": { - "teal": "#80CBC4" - }, "base": { "white": "#FFFFFF", "black": "#000000", diff --git a/src/themes/settings/specific/palenight.json b/src/themes/settings/specific/palenight.json index 729cdc8..0c0bb63 100644 --- a/src/themes/settings/specific/palenight.json +++ b/src/themes/settings/specific/palenight.json @@ -19,9 +19,6 @@ "inputBorder": "#FFFFFF10", "scrollbars": "#00000050", "scrollbarsHover": "#00000030", - "accents": { - "teal": "#80CBC4" - }, "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json index 8a662f1..464c14e 100644 --- a/src/themes/theme-template-color-theme.json +++ b/src/themes/theme-template-color-theme.json @@ -699,9 +699,9 @@ "dropdown.border": "{{variant.scheme.inputBorder}}", "list.hoverBackground": "{{variant.scheme.background}}", "list.activeSelectionBackground": "{{variant.scheme.lineHighlight}}50", - "list.activeSelectionForeground": "{{variant.scheme.accents.teal}}", + "list.activeSelectionForeground": "{{commons.accents.teal.hex}}", "list.inactiveSelectionBackground": "{{variant.scheme.lineHighlight}}50", - "list.highlightForeground": "{{variant.scheme.accents.teal}}", + "list.highlightForeground": "{{commons.accents.teal.hex}}", "list.focusBackground": "{{variant.scheme.lineNumbers}}", "terminal.ansiWhite": "{{variant.scheme.base.white}}", "terminal.ansiBlack": "{{variant.scheme.comments}}", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "{{variant.scheme.base.yellow}}", "scrollbarSlider.background": "{{variant.scheme.scrollbars}}", "scrollbarSlider.hoverBackground": "{{variant.scheme.scrollbarsHover}}", - "scrollbarSlider.activeBackground": "{{variant.scheme.accents.teal}}", + "scrollbarSlider.activeBackground": "{{commons.accents.teal.hex}}", "editorSuggestWidget.background": "{{variant.scheme.background}}", "editorSuggestWidget.foreground": "{{variant.scheme.foreground}}", - "editorSuggestWidget.highlightForeground": "{{variant.scheme.accents.teal}}", + "editorSuggestWidget.highlightForeground": "{{commons.accents.teal.hex}}", "editorSuggestWidget.selectedBackground": "{{variant.scheme.lineHighlight}}50", "editorSuggestWidget.border": "{{variant.scheme.inputBorder}}", "widget.shadow": "{{variant.scheme.shadow}}", "editorWidget.background": "{{variant.scheme.background}}", - "activityBarBadge.background": "{{variant.scheme.accents.teal}}", + "activityBarBadge.background": "{{commons.accents.teal.hex}}", "activityBarBadge.foreground": "{{variant.scheme.base.black}}", "panel.border": "{{variant.scheme.background}}", "panelTitle.activeForeground": "{{variant.scheme.foreground}}", diff --git a/themes/Material-Theme-Darker.json b/themes/Material-Theme-Darker.json index 864e72f..b663487 100644 --- a/themes/Material-Theme-Darker.json +++ b/themes/Material-Theme-Darker.json @@ -699,9 +699,9 @@ "dropdown.border": "#FFFFFF10", "list.hoverBackground": "#212121", "list.activeSelectionBackground": "#00000050", - "list.activeSelectionForeground": "#80CBC4", + "list.activeSelectionForeground": "", "list.inactiveSelectionBackground": "#00000050", - "list.highlightForeground": "#80CBC4", + "list.highlightForeground": "", "list.focusBackground": "#424242", "terminal.ansiWhite": "#ffffff", "terminal.ansiBlack": "#4A4A4A", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFCB6B", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "#80CBC4", + "scrollbarSlider.activeBackground": "", "editorSuggestWidget.background": "#212121", "editorSuggestWidget.foreground": "#EEFFFF", - "editorSuggestWidget.highlightForeground": "#80CBC4", + "editorSuggestWidget.highlightForeground": "", "editorSuggestWidget.selectedBackground": "#00000050", "editorSuggestWidget.border": "#FFFFFF10", "widget.shadow": "#00000030", "editorWidget.background": "#212121", - "activityBarBadge.background": "#80CBC4", + "activityBarBadge.background": "", "activityBarBadge.foreground": "#000000", "panel.border": "#212121", "panelTitle.activeForeground": "#EEFFFF", diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json index 58bb60b..7e528db 100644 --- a/themes/Material-Theme-Default.json +++ b/themes/Material-Theme-Default.json @@ -699,9 +699,9 @@ "dropdown.border": "#FFFFFF10", "list.hoverBackground": "#263238", "list.activeSelectionBackground": "#00000050", - "list.activeSelectionForeground": "#80CBC4", + "list.activeSelectionForeground": "", "list.inactiveSelectionBackground": "#00000050", - "list.highlightForeground": "#80CBC4", + "list.highlightForeground": "", "list.focusBackground": "#37474F", "terminal.ansiWhite": "#ffffff", "terminal.ansiBlack": "#546E7A", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFCB6B", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "#80CBC4", + "scrollbarSlider.activeBackground": "", "editorSuggestWidget.background": "#263238", "editorSuggestWidget.foreground": "#EEFFFF", - "editorSuggestWidget.highlightForeground": "#80CBC4", + "editorSuggestWidget.highlightForeground": "", "editorSuggestWidget.selectedBackground": "#00000050", "editorSuggestWidget.border": "#FFFFFF10", "widget.shadow": "#00000030", "editorWidget.background": "#263238", - "activityBarBadge.background": "#80CBC4", + "activityBarBadge.background": "", "activityBarBadge.foreground": "#000000", "panel.border": "#263238", "panelTitle.activeForeground": "#EEFFFF", diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json index da79452..6845511 100644 --- a/themes/Material-Theme-Lighter.json +++ b/themes/Material-Theme-Lighter.json @@ -699,9 +699,9 @@ "dropdown.border": "#00000010", "list.hoverBackground": "#FAFAFA", "list.activeSelectionBackground": "#CCD7DA50", - "list.activeSelectionForeground": "#80CBC4", + "list.activeSelectionForeground": "", "list.inactiveSelectionBackground": "#CCD7DA50", - "list.highlightForeground": "#80CBC4", + "list.highlightForeground": "", "list.focusBackground": "#CFD8DC", "terminal.ansiWhite": "#FFFFFF", "terminal.ansiBlack": "#CCD7DA", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFB62C", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "#80CBC4", + "scrollbarSlider.activeBackground": "", "editorSuggestWidget.background": "#FAFAFA", "editorSuggestWidget.foreground": "#90A4AE", - "editorSuggestWidget.highlightForeground": "#80CBC4", + "editorSuggestWidget.highlightForeground": "", "editorSuggestWidget.selectedBackground": "#CCD7DA50", "editorSuggestWidget.border": "#00000010", "widget.shadow": "#00000030", "editorWidget.background": "#FAFAFA", - "activityBarBadge.background": "#80CBC4", + "activityBarBadge.background": "", "activityBarBadge.foreground": "#000000", "panel.border": "#FAFAFA", "panelTitle.activeForeground": "#90A4AE", diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json index 500759a..af5da2b 100644 --- a/themes/Material-Theme-Palenight.json +++ b/themes/Material-Theme-Palenight.json @@ -699,9 +699,9 @@ "dropdown.border": "#FFFFFF10", "list.hoverBackground": "#292D3E", "list.activeSelectionBackground": "#00000050", - "list.activeSelectionForeground": "#80CBC4", + "list.activeSelectionForeground": "", "list.inactiveSelectionBackground": "#00000050", - "list.highlightForeground": "#80CBC4", + "list.highlightForeground": "", "list.focusBackground": "#3A3F58", "terminal.ansiWhite": "#ffffff", "terminal.ansiBlack": "#676E95", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFCB6B", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "#80CBC4", + "scrollbarSlider.activeBackground": "", "editorSuggestWidget.background": "#292D3E", "editorSuggestWidget.foreground": "#A6ACCD", - "editorSuggestWidget.highlightForeground": "#80CBC4", + "editorSuggestWidget.highlightForeground": "", "editorSuggestWidget.selectedBackground": "#00000050", "editorSuggestWidget.border": "#FFFFFF10", "widget.shadow": "#00000050", "editorWidget.background": "#292D3E", - "activityBarBadge.background": "#80CBC4", + "activityBarBadge.background": "", "activityBarBadge.foreground": "#000000", "panel.border": "#292D3E", "panelTitle.activeForeground": "#A6ACCD",