Skip to content

Commit

Permalink
Overlay color (#25798)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrmarti committed May 25, 2017
1 parent 485629d commit 9b02670
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
15 changes: 0 additions & 15 deletions src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@
height: 100%;
width: 100%;
z-index: 9999;
background: rgba(0,0,0,0.52);
font-size: 10px;
transition: font-size .25s;
}

.vs .monaco-workbench > .welcomeOverlay {
background: rgba(255,255,255,.52);
}

#workbench\.parts\.editor {
transition: filter .25s, opacity .2s;
}
Expand All @@ -40,23 +35,13 @@
font-size: 1.6em;
}

.monaco-workbench > .welcomeOverlay > .key {
color: #000;
}

.vs-dark .monaco-workbench > .welcomeOverlay > .key,
.hc-black .monaco-workbench > .welcomeOverlay > .key {
color: #FFF;
}

.monaco-workbench > .welcomeOverlay > .key > .label {
padding: 0 1ex;
}

.monaco-workbench > .welcomeOverlay > .key > .shortcut {
letter-spacing: 0.15em;
font-size: 0.8125em;
color: #d7ba7d;
font-family: "Lucida Grande", sans-serif;
}

Expand Down
22 changes: 22 additions & 0 deletions src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { KeyCode } from 'vs/base/common/keyCodes';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { registerColor, textPreformatForeground } from 'vs/platform/theme/common/colorRegistry';

interface Key {
id: string;
Expand Down Expand Up @@ -233,3 +235,23 @@ Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions)

Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions)
.registerWorkbenchAction(new SyncActionDescriptor(HideWelcomeOverlayAction, HideWelcomeOverlayAction.ID, HideWelcomeOverlayAction.LABEL, { primary: KeyCode.Escape }, OVERLAY_VISIBLE), 'Help: Hide Interface Overview', localize('help', "Help"));

// theming

const foreground = registerColor('welcomeOverlay.foreground', { dark: '#fff', light: '#000', hc: '#fff' }, localize('welcomeOverlay.foreground', 'Foreground color for the Interface Overview.'));
const background = registerColor('welcomeOverlay.background', { dark: '#00000085', light: '#FFFFFF85', hc: '#00000085' }, localize('welcomeOverlay.background', 'Background color for the Interface Overview.'));

registerThemingParticipant((theme, collector) => {
const key = theme.getColor(foreground);
if (key) {
collector.addRule(`.monaco-workbench > .welcomeOverlay > .key { color: ${key}; }`);
}
const backgroundColor = theme.getColor(background);
if (backgroundColor) {
collector.addRule(`.monaco-workbench > .welcomeOverlay { background: ${backgroundColor}; }`);
}
const shortcut = theme.getColor(textPreformatForeground);
if (shortcut) {
collector.addRule(`.monaco-workbench > .welcomeOverlay > .key > .shortcut { color: ${shortcut}; }`);
}
});

0 comments on commit 9b02670

Please sign in to comment.