Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid global CSS rules (fixes #469460)

Browse Source
This commit is contained in:
Christof Marti
2018-04-03 11:55:50 +02:00
parent 70ea06a46f
commit 644f5d5d16
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/quickinput/quickInput.ts
+15 -16
View File
@@ -12,7 +12,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
import { Dimension } from 'vs/base/browser/builder';
import * as dom from 'vs/base/browser/dom';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
@@ -93,7 +93,6 @@ export class QuickInputService extends Component implements IQuickInputService {
this.inputBox = new QuickInputBox(filterContainer);
this.toUnbind.push(this.inputBox);
this.inputBox.style(this.themeService.getTheme());
this.inputBox.onDidChange(value => {
this.checkboxList.filter(value);
});
@@ -194,6 +193,8 @@ export class QuickInputService extends Component implements IQuickInputService {
}));
this.toUnbind.push(this.quickOpenService.onShow(() => this.close()));
this.updateStyles();
}
private close(value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) {
@@ -279,21 +280,19 @@ export class QuickInputService extends Component implements IQuickInputService {
}
protected updateStyles() {
const theme = this.themeService.getTheme();
if (this.inputBox) {
this.inputBox.style(this.themeService.getTheme());
this.inputBox.style(theme);
}
if (this.container) {
const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
this.container.style.backgroundColor = sideBarBackground ? sideBarBackground.toString() : undefined;
const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
this.container.style.color = sideBarForeground ? sideBarForeground.toString() : undefined;
const contrastBorderColor = theme.getColor(contrastBorder);
this.container.style.border = contrastBorderColor ? `1px solid ${contrastBorderColor}` : undefined;
const widgetShadowColor = theme.getColor(widgetShadow);
this.container.style.boxShadow = widgetShadowColor ? `0 5px 8px ${widgetShadowColor}` : undefined;
}
}
}
registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
const contrastBorderColor = theme.getColor(contrastBorder);
const widgetShadowColor = theme.getColor(widgetShadow);
collector.addRule(`.quick-input-widget {
${sideBarBackground ? `background-color: ${sideBarBackground};` : ''}
${sideBarForeground ? `color: ${sideBarForeground};` : ''}
${contrastBorderColor ? `border: 1px solid ${contrastBorderColor};` : ''}
${widgetShadowColor ? `box-shadow: 0 5px 8px ${widgetShadowColor};` : ''}
}`);
});