From f042999623d6b85c4d59d25e4461bbe2a1f496ae Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 28 Apr 2017 15:57:44 +0200 Subject: [PATCH] themes - get rid of masterDetailsEditor.border --- extensions/theme-abyss/themes/abyss-color-theme.json | 1 - .../themes/solarized-dark-color-theme.json | 1 - src/vs/workbench/browser/parts/editor/sideBySideEditor.ts | 4 ++-- src/vs/workbench/common/theme.ts | 5 ----- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index fc2572ec09f..6dba39e8919 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -351,7 +351,6 @@ // "editorGroupHeader.noTabsBackground": "", "editorGroup.border": "#2b2b4a", "editorGroup.background": "#1c1c2a", - "masterDetailsEditor.border": "#10192c", "editorGroup.dropBackground": "#25375daa", // Workbench: Tabs 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 6df7eeb4a24..4c9c23c4ba6 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -389,7 +389,6 @@ // "editorGroupHeader.noTabsBackground": "", "editorGroup.border": "#00212B", "editorGroup.background": "#011b23", - "masterDetailsEditor.border": "#00212B", "editorGroup.dropBackground": "#00212BAA", // Workbench: Tabs diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts index 34c2f8f68e8..1d3bcca6be1 100644 --- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts +++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts @@ -17,7 +17,7 @@ import { VSash } from 'vs/base/browser/ui/sash/sash'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { EDITOR_MASTER_DETAILS_BORDER } from 'vs/workbench/common/theme'; +import { scrollbarShadow } from 'vs/platform/theme/common/colorRegistry'; export class SideBySideEditor extends BaseEditor { @@ -165,7 +165,7 @@ export class SideBySideEditor extends BaseEditor { super.updateStyles(); if (this.masterEditorContainer) { - this.masterEditorContainer.style.boxShadow = `-6px 0 5px -5px ${this.getColor(EDITOR_MASTER_DETAILS_BORDER)}`; + this.masterEditorContainer.style.boxShadow = `-6px 0 5px -5px ${this.getColor(scrollbarShadow)}`; } } diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index 389e76cdbac..f4bbe73032f 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.ts @@ -87,11 +87,6 @@ export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorGroup.dropBa hc: null }, nls.localize('editorDragAndDropBackground', "Background color when dragging editors around.")); -export const EDITOR_MASTER_DETAILS_BORDER = registerColor('masterDetailsEditor.border', { - dark: '#000000', - light: '#DDDDDD', - hc: null -}, 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 --- >