diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index 45a5a7960d5..242a1865102 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -352,7 +352,7 @@ // "editorHeaderBackground": "", "editorGroupBorder": "#2b2b4a", "editorGroupBackground": "#1c1c2a", - "editorSideBySideBorder": "#10192c", + "editorMasterDetailsBorder": "#10192c", "editorDragAndDropBackground": "#25375daa", // Workbench: Tabs @@ -389,8 +389,8 @@ "statusBarNoFolderBackground": "#10192c", "statusBarDebuggingBackground": "#10192c", // "statusBarForeground": "", - "statusBarInfoItemBackground": "#0063a5", - "statusBarInfoItemHoverBackground": "#0063a5dd", + "statusBarProminentItemBackground": "#0063a5", + "statusBarProminentItemHoverBackground": "#0063a5dd", "statusBarItemActiveBackground": "#ffffff33", "statusBarItemHoverBackground": "#ffffff22", diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index 5946ce8f9c5..b1142c43cc1 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -390,7 +390,7 @@ // "editorHeaderBackground": "", "editorGroupBorder": "#00212B", "editorGroupBackground": "#011b23", - "editorSideBySideBorder": "#00212B", + "editorMasterDetailsBorder": "#00212B", "editorDragAndDropBackground": "#00212BAA", // Workbench: Tabs @@ -425,8 +425,8 @@ "statusBarBackground": "#00212B", "statusBarDebuggingBackground": "#00212B", "statusBarNoFolderBackground": "#00212B", - "statusBarInfoItemBackground": "#003847", - "statusBarInfoItemHoverBackground": "#003847", + "statusBarProminentItemBackground": "#003847", + "statusBarProminentItemHoverBackground": "#003847", // "statusBarItemActiveBackground": "", // "statusBarItemHoverBackground": "", diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 69ed9cce2e3..d96233466ed 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -27,7 +27,7 @@ import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { Action } from 'vs/base/common/actions'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; -import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_INFO_ITEM_BACKGROUND, STATUS_BAR_INFO_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND } from 'vs/workbench/common/theme'; +import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND } from 'vs/workbench/common/theme'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { highContrastBorder } from 'vs/platform/theme/common/colorRegistry'; @@ -330,13 +330,13 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { collector.addRule(`.monaco-workbench > .part.statusbar > .statusbar-item a:active:not([disabled]):not(.disabled) { background-color: ${statusBarItemActiveBackground}; }`); } - const statusBarInfoItemBackground = theme.getColor(STATUS_BAR_INFO_ITEM_BACKGROUND); - if (statusBarInfoItemBackground) { - collector.addRule(`.monaco-workbench > .part.statusbar > .statusbar-item .status-bar-info { background-color: ${statusBarInfoItemBackground}; }`); + const statusBarProminentItemBackground = theme.getColor(STATUS_BAR_PROMINENT_ITEM_BACKGROUND); + if (statusBarProminentItemBackground) { + collector.addRule(`.monaco-workbench > .part.statusbar > .statusbar-item .status-bar-info { background-color: ${statusBarProminentItemBackground}; }`); } - const statusBarInfoItemHoverBackground = theme.getColor(STATUS_BAR_INFO_ITEM_HOVER_BACKGROUND); - if (statusBarInfoItemHoverBackground) { - collector.addRule(`.monaco-workbench > .part.statusbar > .statusbar-item a.status-bar-info:hover:not([disabled]):not(.disabled) { background-color: ${statusBarInfoItemHoverBackground}; }`); + const statusBarProminentItemHoverBackground = theme.getColor(STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND); + if (statusBarProminentItemHoverBackground) { + collector.addRule(`.monaco-workbench > .part.statusbar > .statusbar-item a.status-bar-info:hover:not([disabled]):not(.disabled) { background-color: ${statusBarProminentItemHoverBackground}; }`); } }); \ No newline at end of file diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index f506a84e39b..ac7e22718ac 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.ts @@ -79,7 +79,7 @@ export const EDITOR_GROUP_BACKGROUND = registerColor('editorGroupBackground', { dark: '#2D2D2D', light: '#ECECEC', hc: null -}, nls.localize('editorGroupBackground', "Background color of an editor group. Editor groups are the containers of editors.")); +}, nls.localize('editorGroupBackground', "Background color of an editor group. Editor groups are the containers of editors. The background color shows up when dragging editor groups around.")); export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorDragAndDropBackground', { dark: Color.fromRGBA(new RGBA(83, 89, 93)).transparent(0.5), @@ -87,11 +87,11 @@ export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorDragAndDropB hc: null }, nls.localize('editorDragAndDropBackground', "Background color when dragging editors around.")); -export const EDITOR_SIDE_BY_SIDE_BORDER = registerColor('editorSideBySideBorder', { +export const EDITOR_SIDE_BY_SIDE_BORDER = registerColor('editorMasterDetailsBorder', { dark: '#000000', light: '#DDDDDD', hc: null -}, nls.localize('editorSideBySideBorder', "Border color to separate the details from the master side for side by side editors.")); +}, nls.localize('editorMasterDetailsBorder', "Border color to separate the details from the master side for side by side editors. Examples include diff editors and the settings editor.")); // < --- Panels --- > @@ -160,17 +160,17 @@ export const STATUS_BAR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItemHove hc: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12) }, nls.localize('statusBarItemHoverBackground', "Status bar item background color when hovering. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_INFO_ITEM_BACKGROUND = registerColor('statusBarInfoItemBackground', { +export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarProminentItemBackground', { dark: '#388A34', light: '#388A34', hc: '#3883A4' -}, nls.localize('statusBarInfoItemBackground', "Status bar info item background color. The status bar is shown in the bottom of the window.")); +}, nls.localize('statusBarProminentItemBackground', "Status bar prominent items background color. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_INFO_ITEM_HOVER_BACKGROUND = registerColor('statusBarInfoItemHoverBackground', { +export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarProminentItemHoverBackground', { dark: '#369432', light: '#369432', hc: '#369432' -}, nls.localize('statusBarInfoItemHoverBackground', "Status bar info item background color when hovering. The status bar is shown in the bottom of the window.")); +}, nls.localize('statusBarProminentItemHoverBackground', "Status bar prominent items background color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));