From b2c8be8f266f7bf99c6c2d411d022a4738c0d028 Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Sat, 5 May 2018 11:55:58 +0200 Subject: [PATCH] fix(Lighter): Fix folders icon association --- extensions/commands/accents-setter/index.ts | 8 ++++++++ extensions/commands/theme-icons/index.ts | 12 +++++++----- src/themes/theme-template-color-theme.json | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/extensions/commands/accents-setter/index.ts b/extensions/commands/accents-setter/index.ts index 3b042e6..f61393e 100644 --- a/extensions/commands/accents-setter/index.ts +++ b/extensions/commands/accents-setter/index.ts @@ -54,6 +54,14 @@ let accentsProperties: IGenericObject = { "notificationLink.foreground": { alpha: 100, value: undefined + }, + "editor.findWidgetResizeBorder": { + alpha: 100, + value: undefined + }, + "editorWidget.border": { + alpha: 100, + value: undefined } } diff --git a/extensions/commands/theme-icons/index.ts b/extensions/commands/theme-icons/index.ts index 93cf51c..a988cc7 100644 --- a/extensions/commands/theme-icons/index.ts +++ b/extensions/commands/theme-icons/index.ts @@ -24,16 +24,18 @@ function replaceIconPathWithAccent(iconPath: string, accentName: string): string return iconPath.replace('.svg', `.accent.${ accentName }.svg`); } -function getVariantFromColor(color: string): string { - switch (color) { - case undefined || 'Material Theme': +const getVariantFromColor = (color: string): string => { + switch (true) { + case color === undefined || color === 'Material Theme': return 'Default'; - case 'Material Theme High Contrast': + case color === 'Material Theme High Contrast': return 'Default High Contrast'; + case color.includes('Material Theme Lighter'): + return 'Light'; default: return color.replace(/Material Theme /gi, ''); } -} +}; export const THEME_ICONS = () => { let deferred: any = {}; diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json index 1c3f053..bdb9a8b 100644 --- a/src/themes/theme-template-color-theme.json +++ b/src/themes/theme-template-color-theme.json @@ -785,6 +785,8 @@ "editorError.foreground": "{{variant.scheme.base.red}}70", "editorWarning.foreground": "{{variant.scheme.base.green}}70", "editorWidget.background": "{{variant.scheme.backgroundAlt}}", + "editor.findWidgetResizeBorder": "{{commons.accents.Teal}}", + "editorWidget.border": "{{variant.scheme.base.Teal}}", "editorMarkerNavigation.background": "{{variant.scheme.foreground}}05", "widget.shadow": "{{variant.scheme.shadow}}", "panel.border": "{{variant.scheme.contrastBorder}}60",