From cee788d1905e0294afd450b56ef60877300d0e10 Mon Sep 17 00:00:00 2001 From: xiaowei Date: Sun, 21 Mar 2021 16:45:39 +0800 Subject: [PATCH] fix(theme): improve the colorTheme detail fix #20 --- src/services/theme/colorRegistry.ts | 11 ++++++----- src/style/theme/actionbar.scss | 2 +- src/workbench/editor/welcome/style.scss | 1 + src/workbench/panel/style.scss | 5 +++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/services/theme/colorRegistry.ts b/src/services/theme/colorRegistry.ts index 72a4eb4b4..5db303e40 100644 --- a/src/services/theme/colorRegistry.ts +++ b/src/services/theme/colorRegistry.ts @@ -34,7 +34,6 @@ const defaultVS = { 'checkbox.border': Color.white, 'button.background': '#007ACC', 'button.foreground': Color.white, - // 'button.hoverBackground': Color.fromHex('#007ACC').transparent(0.2), 'badge.background': '#C4C4C4', 'badge.foreground': '#333', @@ -68,6 +67,9 @@ const defaultVS = { 'menu.background': Color.white, 'menu.separatorBackground': '#888888', + 'panel.background': Color.white, + 'panel.border': 'rgba(128, 128, 128, 0.35)', + 'activityBar.background': 'rgb(51, 51, 51)', 'activityBar.activeBorder': '#fff', 'activityBar.foreground': 'rgba(255, 255, 255, 0.4)', @@ -105,7 +107,7 @@ const defaultDark = { 'checkbox.border': '#CECECE', 'button.background': '#0E639C', 'button.foreground': Color.white, - // 'button.hoverBackground': Color.fromHex('#0E639C').transparent(0.2), + 'button.hoverBackground': Color.fromHex('#0E639C').transparent(0.2), 'badge.background': '#4D4D4D', 'badge.foreground': Color.white, @@ -139,9 +141,8 @@ const defaultDark = { 'menu.background': '#3C3C3C', 'menu.separatorBackground': '#BBBBBB', - 'panel.background': 'rgb(37, 37, 38);', - 'panel.foreground': Color.white, - 'panel.border': '#CECECE', + 'panel.background': 'rgb(30, 30, 30)', + 'panel.border': '#3C3C3C', 'activityBar.background': 'rgb(51, 51, 51)', 'activityBar.activeBorder': '#fff', diff --git a/src/style/theme/actionbar.scss b/src/style/theme/actionbar.scss index ef7256e74..d83dd8cfc 100644 --- a/src/style/theme/actionbar.scss +++ b/src/style/theme/actionbar.scss @@ -3,7 +3,7 @@ // =============== Action Bar =============== // #{$actionBar} { background-color: var(--listFilterWidget-background); - color: var(--button-foreground); + color: var(--foreground); outline-color: var(--listFilterWidget-outline); &__item--checked { diff --git a/src/workbench/editor/welcome/style.scss b/src/workbench/editor/welcome/style.scss index 08f5ac625..c51748bac 100644 --- a/src/workbench/editor/welcome/style.scss +++ b/src/workbench/editor/welcome/style.scss @@ -2,6 +2,7 @@ #{prefix('welcome')} { align-items: center; + background-color: var(--panel-background); display: flex; justify-content: center; text-align: center; diff --git a/src/workbench/panel/style.scss b/src/workbench/panel/style.scss index 4d8a8bbc2..2cb14f4b9 100644 --- a/src/workbench/panel/style.scss +++ b/src/workbench/panel/style.scss @@ -13,6 +13,7 @@ } &__header { + border-color: inherit; border-top-style: solid; border-top-width: 1px; flex-direction: row; @@ -22,10 +23,14 @@ width: 100%; #{$tabs} { + background: inherit; + border: 0; flex-grow: 1; } #{$tab}__item { + background: inherit; + border: 0; font-size: 11px; padding: 0 10px; text-transform: uppercase;