maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

editorHeaderBackground => editorGroupHeaderBackground

Browse source
This commit is contained in:
Benjamin Pasero 2017-04-27 14:43:39 +02:00
parent 9bfbe7b32f
commit 8a34b0ebd7
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/theme-abyss/themes/abyss-color-theme.json
View file

@ -348,7 +348,7 @@
// "titleBarInactiveForeground": "",
// Workbench: Editors
// "editorHeaderBackground": "",
// "editorGroupHeaderBackground": "",
"editorGroupBorder": "#2b2b4a",
"editorGroupBackground": "#1c1c2a",
"editorMasterDetailsBorder": "#10192c",

2
extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
View file

@ -386,7 +386,7 @@
"titleBarInactiveBackground": "#002C39",
// Workbench: Editors
// "editorHeaderBackground": "",
// "editorGroupHeaderBackground": "",
"editorGroupBorder": "#00212B",
"editorGroupBackground": "#011b23",
"editorMasterDetailsBorder": "#00212B",

4
src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
View file

@ -35,7 +35,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
import { getCodeEditor } from 'vs/editor/common/services/codeEditorService';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { editorBackground, highContrastBorder, highContrastOutline } from 'vs/platform/theme/common/colorRegistry';
import { Themable, TABS_CONTAINER_BACKGROUND, EDITOR_HEADER_BACKGROUND, EDITOR_GROUP_BORDER_COLOR, EDITOR_DRAG_AND_DROP_BACKGROUND, EDITOR_GROUP_BACKGROUND } from 'vs/workbench/common/theme';
import { Themable, TABS_CONTAINER_BACKGROUND, EDITOR_GROUP_HEADER_BACKGROUND, EDITOR_GROUP_BORDER_COLOR, EDITOR_DRAG_AND_DROP_BACKGROUND, EDITOR_GROUP_BACKGROUND } from 'vs/workbench/common/theme';
export enum Rochade {
NONE,
@ -1018,7 +1018,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
const container = this.getTitleAreaControl(position).getContainer();
const hcBorder = this.getColor(highContrastBorder);
container.style.backgroundColor = this.getColor(this.tabOptions.showTabs ? TABS_CONTAINER_BACKGROUND : EDITOR_HEADER_BACKGROUND);
container.style.backgroundColor = this.getColor(this.tabOptions.showTabs ? TABS_CONTAINER_BACKGROUND : EDITOR_GROUP_HEADER_BACKGROUND);
container.style.borderBottomWidth = (hcBorder && this.tabOptions.showTabs) ? '1px' : null;
container.style.borderBottomStyle = (hcBorder && this.tabOptions.showTabs) ? 'solid' : null;
container.style.borderBottomColor = this.tabOptions.showTabs ? hcBorder : null;

4
src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
View file

@ -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_SIDE_BY_SIDE_BORDER } from 'vs/workbench/common/theme';
import { EDITOR_MASTER_DETAILS_BORDER } from 'vs/workbench/common/theme';
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_SIDE_BY_SIDE_BORDER)}`;
this.masterEditorContainer.style.boxShadow = `-6px 0 5px -5px ${this.getColor(EDITOR_MASTER_DETAILS_BORDER)}`;
}
}

18
src/vs/workbench/common/theme.ts
View file

@ -63,11 +63,17 @@ export const TAB_BORDER = registerColor('tabBorder', {
// < --- Editors --- >
export const EDITOR_HEADER_BACKGROUND = registerColor('editorHeaderBackground', {
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. The background color shows up when dragging editor groups around."));
export const EDITOR_GROUP_HEADER_BACKGROUND = registerColor('editorGroupHeaderBackground', {
dark: editorBackground,
light: editorBackground,
hc: editorBackground
}, nls.localize('editorHeaderBackground', "Background color of the editor title header when tabs are disabled."));
}, nls.localize('editorGroupHeaderBackground', "Background color of the editor group title header when tabs are disabled. Editor groups are the containers of editors."));
export const EDITOR_GROUP_BORDER_COLOR = registerColor('editorGroupBorder', {
dark: '#444444',
@ -75,19 +81,13 @@ export const EDITOR_GROUP_BORDER_COLOR = registerColor('editorGroupBorder', {
hc: highContrastBorder
}, nls.localize('editorGroupBorder', "Color to separate multiple editor groups from each other. Editor groups are the containers of editors."));
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. 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),
light: Color.fromRGBA(new RGBA(51, 153, 255)).transparent(0.18),
hc: null
}, nls.localize('editorDragAndDropBackground', "Background color when dragging editors around."));
export const EDITOR_SIDE_BY_SIDE_BORDER = registerColor('editorMasterDetailsBorder', {
export const EDITOR_MASTER_DETAILS_BORDER = registerColor('editorMasterDetailsBorder', {
dark: '#000000',
light: '#DDDDDD',
hc: null