From d7cc91de0803ac09eaafa5ad79dc083238fc6f68 Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Fri, 5 May 2017 21:44:46 +0200 Subject: [PATCH] chore: Integrate commons theme colors --- .gulp/tasks/themes.js | 2 +- src/themes/settings/commons.json | 10 +++------- 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 +++++----- 7 files changed, 29 insertions(+), 33 deletions(-) diff --git a/.gulp/tasks/themes.js b/.gulp/tasks/themes.js index 0d394de..e9ec018 100644 --- a/.gulp/tasks/themes.js +++ b/.gulp/tasks/themes.js @@ -36,7 +36,7 @@ gulp.task('build:themes', cb => { themeVariants.forEach(variant => { const templateData = { 'commons': themeCommons, - variant, + variant }; const templateJson = JSON.parse( diff --git a/src/themes/settings/commons.json b/src/themes/settings/commons.json index 8448bf0..b898b66 100644 --- a/src/themes/settings/commons.json +++ b/src/themes/settings/commons.json @@ -1,9 +1,5 @@ { - "accents": [{ - "teal": { - "id": "teal", - "name": "Teal", - "hex": "#80CBC4" - } - }] + "accents": { + "teal": "#80CBC4" + } } \ No newline at end of file diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json index 464c14e..9664c60 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": "{{commons.accents.teal.hex}}", + "list.activeSelectionForeground": "{{commons.accents.teal}}", "list.inactiveSelectionBackground": "{{variant.scheme.lineHighlight}}50", - "list.highlightForeground": "{{commons.accents.teal.hex}}", + "list.highlightForeground": "{{commons.accents.teal}}", "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": "{{commons.accents.teal.hex}}", + "scrollbarSlider.activeBackground": "{{commons.accents.teal}}", "editorSuggestWidget.background": "{{variant.scheme.background}}", "editorSuggestWidget.foreground": "{{variant.scheme.foreground}}", - "editorSuggestWidget.highlightForeground": "{{commons.accents.teal.hex}}", + "editorSuggestWidget.highlightForeground": "{{commons.accents.teal}}", "editorSuggestWidget.selectedBackground": "{{variant.scheme.lineHighlight}}50", "editorSuggestWidget.border": "{{variant.scheme.inputBorder}}", "widget.shadow": "{{variant.scheme.shadow}}", "editorWidget.background": "{{variant.scheme.background}}", - "activityBarBadge.background": "{{commons.accents.teal.hex}}", + "activityBarBadge.background": "{{commons.accents.teal}}", "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 b663487..864e72f 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": "", + "list.activeSelectionForeground": "#80CBC4", "list.inactiveSelectionBackground": "#00000050", - "list.highlightForeground": "", + "list.highlightForeground": "#80CBC4", "list.focusBackground": "#424242", "terminal.ansiWhite": "#ffffff", "terminal.ansiBlack": "#4A4A4A", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFCB6B", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "", + "scrollbarSlider.activeBackground": "#80CBC4", "editorSuggestWidget.background": "#212121", "editorSuggestWidget.foreground": "#EEFFFF", - "editorSuggestWidget.highlightForeground": "", + "editorSuggestWidget.highlightForeground": "#80CBC4", "editorSuggestWidget.selectedBackground": "#00000050", "editorSuggestWidget.border": "#FFFFFF10", "widget.shadow": "#00000030", "editorWidget.background": "#212121", - "activityBarBadge.background": "", + "activityBarBadge.background": "#80CBC4", "activityBarBadge.foreground": "#000000", "panel.border": "#212121", "panelTitle.activeForeground": "#EEFFFF", diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json index 7e528db..58bb60b 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": "", + "list.activeSelectionForeground": "#80CBC4", "list.inactiveSelectionBackground": "#00000050", - "list.highlightForeground": "", + "list.highlightForeground": "#80CBC4", "list.focusBackground": "#37474F", "terminal.ansiWhite": "#ffffff", "terminal.ansiBlack": "#546E7A", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFCB6B", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "", + "scrollbarSlider.activeBackground": "#80CBC4", "editorSuggestWidget.background": "#263238", "editorSuggestWidget.foreground": "#EEFFFF", - "editorSuggestWidget.highlightForeground": "", + "editorSuggestWidget.highlightForeground": "#80CBC4", "editorSuggestWidget.selectedBackground": "#00000050", "editorSuggestWidget.border": "#FFFFFF10", "widget.shadow": "#00000030", "editorWidget.background": "#263238", - "activityBarBadge.background": "", + "activityBarBadge.background": "#80CBC4", "activityBarBadge.foreground": "#000000", "panel.border": "#263238", "panelTitle.activeForeground": "#EEFFFF", diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json index 6845511..da79452 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": "", + "list.activeSelectionForeground": "#80CBC4", "list.inactiveSelectionBackground": "#CCD7DA50", - "list.highlightForeground": "", + "list.highlightForeground": "#80CBC4", "list.focusBackground": "#CFD8DC", "terminal.ansiWhite": "#FFFFFF", "terminal.ansiBlack": "#CCD7DA", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFB62C", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "", + "scrollbarSlider.activeBackground": "#80CBC4", "editorSuggestWidget.background": "#FAFAFA", "editorSuggestWidget.foreground": "#90A4AE", - "editorSuggestWidget.highlightForeground": "", + "editorSuggestWidget.highlightForeground": "#80CBC4", "editorSuggestWidget.selectedBackground": "#CCD7DA50", "editorSuggestWidget.border": "#00000010", "widget.shadow": "#00000030", "editorWidget.background": "#FAFAFA", - "activityBarBadge.background": "", + "activityBarBadge.background": "#80CBC4", "activityBarBadge.foreground": "#000000", "panel.border": "#FAFAFA", "panelTitle.activeForeground": "#90A4AE", diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json index af5da2b..500759a 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": "", + "list.activeSelectionForeground": "#80CBC4", "list.inactiveSelectionBackground": "#00000050", - "list.highlightForeground": "", + "list.highlightForeground": "#80CBC4", "list.focusBackground": "#3A3F58", "terminal.ansiWhite": "#ffffff", "terminal.ansiBlack": "#676E95", @@ -721,15 +721,15 @@ "terminal.ansiBrightYellow": "#FFCB6B", "scrollbarSlider.background": "#00000050", "scrollbarSlider.hoverBackground": "#00000030", - "scrollbarSlider.activeBackground": "", + "scrollbarSlider.activeBackground": "#80CBC4", "editorSuggestWidget.background": "#292D3E", "editorSuggestWidget.foreground": "#A6ACCD", - "editorSuggestWidget.highlightForeground": "", + "editorSuggestWidget.highlightForeground": "#80CBC4", "editorSuggestWidget.selectedBackground": "#00000050", "editorSuggestWidget.border": "#FFFFFF10", "widget.shadow": "#00000050", "editorWidget.background": "#292D3E", - "activityBarBadge.background": "", + "activityBarBadge.background": "#80CBC4", "activityBarBadge.foreground": "#000000", "panel.border": "#292D3E", "panelTitle.activeForeground": "#A6ACCD",