fix #25379
This commit is contained in:
Benjamin Pasero
parent
9f658fdae2
commit
0f090fc429
|
|
@ -254,12 +254,6 @@
|
|||
// Base
|
||||
// "foreground": "",
|
||||
"focusBorder": "#596F99",
|
||||
"infoBorder": "#384078",
|
||||
"infoBackground": "#051336",
|
||||
"warningBackground": "#5B7E7A",
|
||||
"warningBorder": "#5B7E7A",
|
||||
"errorBackground": "#A22D44",
|
||||
"errorBorder": "#AB395B",
|
||||
|
||||
// "widgetShadow": "",
|
||||
|
||||
|
|
@ -267,6 +261,12 @@
|
|||
// "inputBoxBorder": "",
|
||||
// "inputBoxForeground": "",
|
||||
"inputBoxActiveOptionBorder": "#1D4A87",
|
||||
"inputValidationInfoBorder": "#384078",
|
||||
"inputValidationInfoBackground": "#051336",
|
||||
"inputValidationWarningBackground": "#5B7E7A",
|
||||
"inputValidationWarningBorder": "#5B7E7A",
|
||||
"inputValidationErrorBackground": "#A22D44",
|
||||
"inputValidationErrorBorder": "#AB395B",
|
||||
|
||||
// "dropdownBackground": "#181f2f",
|
||||
// "dropdownForeground": "",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@
|
|||
"dropdownBackground": "#580000",
|
||||
"inputBoxBackground": "#580000",
|
||||
"inputBoxActiveOptionBorder": "#cc0000",
|
||||
"inputValidationInfoBackground": "#550000",
|
||||
"inputValidationInfoBorder": "#773333"
|
||||
"listHoverBackground": "#800000",
|
||||
"listActiveSelectionBackground": "#700000",
|
||||
"listInactiveSelectionBackground": "#770000",
|
||||
|
|
@ -47,8 +49,6 @@
|
|||
"notificationsBackground": "#662222",
|
||||
"pickerGroupForeground": "#cc9999",
|
||||
"pickerGroupBorder": "#ff000033",
|
||||
"infoBackground": "#550000",
|
||||
"infoBorder": "#773333"
|
||||
},
|
||||
"name": "Red"
|
||||
}
|
||||
|
|
@ -296,18 +296,18 @@
|
|||
// Base
|
||||
// "foreground": "",
|
||||
"focusBorder": "#2AA19899",
|
||||
"infoBorder": "#384078",
|
||||
"infoBackground": "#051336",
|
||||
"warningBackground": "#5B7E7A",
|
||||
"warningBorder": "#5B7E7A",
|
||||
"errorBackground": "#A22D44",
|
||||
"errorBorder": "#AB395B",
|
||||
|
||||
// "widgetShadow": "",
|
||||
|
||||
"inputBoxBackground": "#003847",
|
||||
"inputBoxForeground": "#93A1A1",
|
||||
"inputBoxActiveOptionBorder": "#2AA19899",
|
||||
"inputValidationInfoBorder": "#384078",
|
||||
"inputValidationInfoBackground": "#051336",
|
||||
"inputValidationWarningBackground": "#5B7E7A",
|
||||
"inputValidationWarningBorder": "#5B7E7A",
|
||||
"inputValidationErrorBackground": "#A22D44",
|
||||
"inputValidationErrorBorder": "#AB395B",
|
||||
|
||||
"dropdownBackground": "#00212B",
|
||||
"dropdownBorder": "#2AA19899",
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@ export class FindInput extends Widget {
|
|||
private inputForeground: Color;
|
||||
private inputBorder: Color;
|
||||
|
||||
private infoBorder: Color;
|
||||
private infoBackground: Color;
|
||||
private warningBorder: Color;
|
||||
private warningBackground: Color;
|
||||
private errorBorder: Color;
|
||||
private errorBackground: Color;
|
||||
private inputValidationInfoBorder: Color;
|
||||
private inputValidationInfoBackground: Color;
|
||||
private inputValidationWarningBorder: Color;
|
||||
private inputValidationWarningBackground: Color;
|
||||
private inputValidationErrorBorder: Color;
|
||||
private inputValidationErrorBackground: Color;
|
||||
|
||||
private regex: RegexCheckbox;
|
||||
private wholeWords: WholeWordsCheckbox;
|
||||
|
|
@ -91,12 +91,12 @@ export class FindInput extends Widget {
|
|||
this.inputForeground = options.inputForeground;
|
||||
this.inputBorder = options.inputBorder;
|
||||
|
||||
this.infoBorder = options.infoBorder;
|
||||
this.infoBackground = options.infoBackground;
|
||||
this.warningBorder = options.warningBorder;
|
||||
this.warningBackground = options.warningBackground;
|
||||
this.errorBorder = options.errorBorder;
|
||||
this.errorBackground = options.errorBackground;
|
||||
this.inputValidationInfoBorder = options.inputValidationInfoBorder;
|
||||
this.inputValidationInfoBackground = options.inputValidationInfoBackground;
|
||||
this.inputValidationWarningBorder = options.inputValidationWarningBorder;
|
||||
this.inputValidationWarningBackground = options.inputValidationWarningBackground;
|
||||
this.inputValidationErrorBorder = options.inputValidationErrorBorder;
|
||||
this.inputValidationErrorBackground = options.inputValidationErrorBackground;
|
||||
|
||||
this.regex = null;
|
||||
this.wholeWords = null;
|
||||
|
|
@ -168,12 +168,12 @@ export class FindInput extends Widget {
|
|||
this.inputForeground = styles.inputForeground;
|
||||
this.inputBorder = styles.inputBorder;
|
||||
|
||||
this.infoBackground = styles.infoBackground;
|
||||
this.infoBorder = styles.infoBorder;
|
||||
this.warningBackground = styles.warningBackground;
|
||||
this.warningBorder = styles.warningBorder;
|
||||
this.errorBackground = styles.errorBackground;
|
||||
this.errorBorder = styles.errorBorder;
|
||||
this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
|
||||
this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
|
||||
this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
|
||||
this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
|
||||
this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
|
||||
this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
|
||||
|
||||
this.applyStyles();
|
||||
}
|
||||
|
|
@ -191,12 +191,12 @@ export class FindInput extends Widget {
|
|||
inputBackground: this.inputBackground,
|
||||
inputForeground: this.inputForeground,
|
||||
inputBorder: this.inputBorder,
|
||||
infoBackground: this.infoBackground,
|
||||
infoBorder: this.infoBorder,
|
||||
warningBackground: this.warningBackground,
|
||||
warningBorder: this.warningBorder,
|
||||
errorBackground: this.errorBackground,
|
||||
errorBorder: this.errorBorder
|
||||
inputValidationInfoBackground: this.inputValidationInfoBackground,
|
||||
inputValidationInfoBorder: this.inputValidationInfoBorder,
|
||||
inputValidationWarningBackground: this.inputValidationWarningBackground,
|
||||
inputValidationWarningBorder: this.inputValidationWarningBorder,
|
||||
inputValidationErrorBackground: this.inputValidationErrorBackground,
|
||||
inputValidationErrorBorder: this.inputValidationErrorBorder
|
||||
};
|
||||
this.inputBox.style(inputBoxStyles);
|
||||
}
|
||||
|
|
@ -268,12 +268,12 @@ export class FindInput extends Widget {
|
|||
inputBackground: this.inputBackground,
|
||||
inputForeground: this.inputForeground,
|
||||
inputBorder: this.inputBorder,
|
||||
infoBackground: this.infoBackground,
|
||||
infoBorder: this.infoBorder,
|
||||
warningBackground: this.warningBackground,
|
||||
warningBorder: this.warningBorder,
|
||||
errorBackground: this.errorBackground,
|
||||
errorBorder: this.errorBorder
|
||||
inputValidationInfoBackground: this.inputValidationInfoBackground,
|
||||
inputValidationInfoBorder: this.inputValidationInfoBorder,
|
||||
inputValidationWarningBackground: this.inputValidationWarningBackground,
|
||||
inputValidationWarningBorder: this.inputValidationWarningBorder,
|
||||
inputValidationErrorBackground: this.inputValidationErrorBackground,
|
||||
inputValidationErrorBorder: this.inputValidationErrorBorder
|
||||
}));
|
||||
|
||||
this.regex = this._register(new RegexCheckbox({
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@ export interface IInputBoxStyles {
|
|||
inputBackground?: Color;
|
||||
inputForeground?: Color;
|
||||
inputBorder?: Color;
|
||||
infoBorder?: Color;
|
||||
infoBackground?: Color;
|
||||
warningBorder?: Color;
|
||||
warningBackground?: Color;
|
||||
errorBorder?: Color;
|
||||
errorBackground?: Color;
|
||||
inputValidationInfoBorder?: Color;
|
||||
inputValidationInfoBackground?: Color;
|
||||
inputValidationWarningBorder?: Color;
|
||||
inputValidationWarningBackground?: Color;
|
||||
inputValidationErrorBorder?: Color;
|
||||
inputValidationErrorBackground?: Color;
|
||||
}
|
||||
|
||||
export interface IInputValidator {
|
||||
|
|
@ -72,12 +72,12 @@ export interface IRange {
|
|||
const defaultOpts = {
|
||||
inputBackground: Color.fromHex('#3C3C3C'),
|
||||
inputForeground: Color.fromHex('#CCCCCC'),
|
||||
infoBorder: Color.fromHex('#55AAFF'),
|
||||
infoBackground: Color.fromHex('#063B49'),
|
||||
warningBorder: Color.fromHex('#B89500'),
|
||||
warningBackground: Color.fromHex('#352A05'),
|
||||
errorBorder: Color.fromHex('#BE1100'),
|
||||
errorBackground: Color.fromHex('#5A1D1D')
|
||||
inputValidationInfoBorder: Color.fromHex('#55AAFF'),
|
||||
inputValidationInfoBackground: Color.fromHex('#063B49'),
|
||||
inputValidationWarningBorder: Color.fromHex('#B89500'),
|
||||
inputValidationWarningBackground: Color.fromHex('#352A05'),
|
||||
inputValidationErrorBorder: Color.fromHex('#BE1100'),
|
||||
inputValidationErrorBackground: Color.fromHex('#5A1D1D')
|
||||
};
|
||||
|
||||
export class InputBox extends Widget {
|
||||
|
|
@ -99,12 +99,12 @@ export class InputBox extends Widget {
|
|||
private inputForeground: Color;
|
||||
private inputBorder: Color;
|
||||
|
||||
private infoBorder: Color;
|
||||
private infoBackground: Color;
|
||||
private warningBorder: Color;
|
||||
private warningBackground: Color;
|
||||
private errorBorder: Color;
|
||||
private errorBackground: Color;
|
||||
private inputValidationInfoBorder: Color;
|
||||
private inputValidationInfoBackground: Color;
|
||||
private inputValidationWarningBorder: Color;
|
||||
private inputValidationWarningBackground: Color;
|
||||
private inputValidationErrorBorder: Color;
|
||||
private inputValidationErrorBackground: Color;
|
||||
|
||||
private _onDidChange = this._register(new Emitter<string>());
|
||||
public onDidChange: Event<string> = this._onDidChange.event;
|
||||
|
|
@ -127,12 +127,12 @@ export class InputBox extends Widget {
|
|||
this.inputForeground = this.options.inputForeground;
|
||||
this.inputBorder = this.options.inputBorder;
|
||||
|
||||
this.infoBorder = this.options.infoBorder;
|
||||
this.infoBackground = this.options.infoBackground;
|
||||
this.warningBorder = this.options.warningBorder;
|
||||
this.warningBackground = this.options.warningBackground;
|
||||
this.errorBorder = this.options.errorBorder;
|
||||
this.errorBackground = this.options.errorBackground;
|
||||
this.inputValidationInfoBorder = this.options.inputValidationInfoBorder;
|
||||
this.inputValidationInfoBackground = this.options.inputValidationInfoBackground;
|
||||
this.inputValidationWarningBorder = this.options.inputValidationWarningBorder;
|
||||
this.inputValidationWarningBackground = this.options.inputValidationWarningBackground;
|
||||
this.inputValidationErrorBorder = this.options.inputValidationErrorBorder;
|
||||
this.inputValidationErrorBackground = this.options.inputValidationErrorBackground;
|
||||
|
||||
if (this.options.validationOptions) {
|
||||
this.validation = this.options.validationOptions.validation;
|
||||
|
|
@ -350,9 +350,9 @@ export class InputBox extends Widget {
|
|||
|
||||
private stylesForType(type: MessageType): { border: Color; background: Color } {
|
||||
switch (type) {
|
||||
case MessageType.INFO: return { border: this.infoBorder, background: this.infoBackground };
|
||||
case MessageType.WARNING: return { border: this.warningBorder, background: this.warningBackground };
|
||||
default: return { border: this.errorBorder, background: this.errorBackground };
|
||||
case MessageType.INFO: return { border: this.inputValidationInfoBorder, background: this.inputValidationInfoBackground };
|
||||
case MessageType.WARNING: return { border: this.inputValidationWarningBorder, background: this.inputValidationWarningBackground };
|
||||
default: return { border: this.inputValidationErrorBorder, background: this.inputValidationErrorBackground };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -445,12 +445,12 @@ export class InputBox extends Widget {
|
|||
this.inputForeground = styles.inputForeground;
|
||||
this.inputBorder = styles.inputBorder;
|
||||
|
||||
this.infoBackground = styles.infoBackground;
|
||||
this.infoBorder = styles.infoBorder;
|
||||
this.warningBackground = styles.warningBackground;
|
||||
this.warningBorder = styles.warningBorder;
|
||||
this.errorBackground = styles.errorBackground;
|
||||
this.errorBorder = styles.errorBorder;
|
||||
this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
|
||||
this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
|
||||
this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
|
||||
this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
|
||||
this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
|
||||
this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
|
||||
|
||||
this.applyStyles();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,12 +171,12 @@ export class QuickOpenWidget implements IModelProvider {
|
|||
inputBackground: this.styles.inputBackground,
|
||||
inputForeground: this.styles.inputForeground,
|
||||
inputBorder: this.styles.inputBorder,
|
||||
infoBackground: this.styles.infoBackground,
|
||||
infoBorder: this.styles.infoBorder,
|
||||
warningBackground: this.styles.warningBackground,
|
||||
warningBorder: this.styles.warningBorder,
|
||||
errorBackground: this.styles.errorBackground,
|
||||
errorBorder: this.styles.errorBorder
|
||||
inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
|
||||
inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
|
||||
inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
|
||||
inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
|
||||
inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
|
||||
inputValidationErrorBorder: this.styles.inputValidationErrorBorder
|
||||
});
|
||||
|
||||
// ARIA
|
||||
|
|
@ -356,12 +356,12 @@ export class QuickOpenWidget implements IModelProvider {
|
|||
inputBackground: this.styles.inputBackground,
|
||||
inputForeground: this.styles.inputForeground,
|
||||
inputBorder: this.styles.inputBorder,
|
||||
infoBackground: this.styles.infoBackground,
|
||||
infoBorder: this.styles.infoBorder,
|
||||
warningBackground: this.styles.warningBackground,
|
||||
warningBorder: this.styles.warningBorder,
|
||||
errorBackground: this.styles.errorBackground,
|
||||
errorBorder: this.styles.errorBorder
|
||||
inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
|
||||
inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
|
||||
inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
|
||||
inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
|
||||
inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
|
||||
inputValidationErrorBorder: this.styles.inputValidationErrorBorder
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import { CONTEXT_FIND_INPUT_FOCUSSED } from 'vs/editor/contrib/find/common/findC
|
|||
import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { Color } from 'vs/base/common/color';
|
||||
import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
|
||||
import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, infoBackground, infoBorder, warningBackground, warningBorder, errorBackground, errorBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
|
||||
export interface IFindController {
|
||||
replace(): void;
|
||||
|
|
@ -353,12 +353,12 @@ export class FindWidget extends Widget implements IOverlayWidget {
|
|||
inputBackground: theme.getColor(inputBackground),
|
||||
inputForeground: theme.getColor(inputForeground),
|
||||
inputBorder: theme.getColor(inputBorder),
|
||||
infoBackground: theme.getColor(infoBackground),
|
||||
infoBorder: theme.getColor(infoBorder),
|
||||
warningBackground: theme.getColor(warningBackground),
|
||||
warningBorder: theme.getColor(warningBorder),
|
||||
errorBackground: theme.getColor(errorBackground),
|
||||
errorBorder: theme.getColor(errorBorder)
|
||||
inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
|
||||
inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
|
||||
inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
|
||||
inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
|
||||
inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
|
||||
inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder)
|
||||
};
|
||||
this._findInput.style(inputStyles);
|
||||
this._replaceInputBox.style(inputStyles);
|
||||
|
|
|
|||
|
|
@ -125,13 +125,6 @@ export const focusBorder = registerColor('focusBorder', { dark: Color.fromRGBA(n
|
|||
export const contrastBorder = registerColor('contrastBorder', { light: null, dark: null, hc: '#6FC3DF' }, nls.localize('contrastBorder', "An extra border around elements to separate them from others for greater contrast."));
|
||||
export const activeContrastBorder = registerColor('activeContrastBorder', { light: null, dark: null, hc: focusBorder }, nls.localize('activeContrastBorder', "An extra border around active elements to separate them from others for greater contrast."));
|
||||
|
||||
export const infoBackground = registerColor('infoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('infoBackground', "Overall info background color. This color is only used if not overridden by a component."));
|
||||
export const infoBorder = registerColor('infoBorder', { dark: '#55AAFF', light: '#009CCC', hc: '#6FC3DF' }, nls.localize('infoBorder', "Overall info border color. This color is only used if not overridden by a component."));
|
||||
export const warningBackground = registerColor('warningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('warningBackground', "Overall warning background color. This color is only used if not overridden by a component."));
|
||||
export const warningBorder = registerColor('warningBorder', { dark: '#B89500', light: '#F2CB1D', hc: '#B89500' }, nls.localize('warningBorder', "Overall warning border color. This color is only used if not overridden by a component."));
|
||||
export const errorBackground = registerColor('errorBackground', { dark: '#5A1D1D', light: '#F2DEDE', hc: Color.black }, nls.localize('errorBackground', "Overall error background color. This color is only used if not overridden by a component."));
|
||||
export const errorBorder = registerColor('errorBorder', { dark: '#BE1100', light: '#E51400', hc: '#BE1100' }, nls.localize('errorBorder', "Overall error border color. This color is only used if not overridden by a component."));
|
||||
|
||||
// ----- widgets
|
||||
export const widgetShadow = registerColor('widgetShadow', { dark: '#000000', light: '#A8A8A8', hc: null }, nls.localize('widgetShadow', 'Shadow color of widgets such as find/replace inside the editor.'));
|
||||
|
||||
|
|
@ -139,6 +132,12 @@ export const inputBackground = registerColor('inputBoxBackground', { dark: '#3C3
|
|||
export const inputForeground = registerColor('inputBoxForeground', { dark: foreground, light: foreground, hc: foreground }, nls.localize('inputBoxForeground', "Input box foreground."));
|
||||
export const inputBorder = registerColor('inputBoxBorder', { dark: null, light: null, hc: contrastBorder }, nls.localize('inputBoxBorder', "Input box border."));
|
||||
export const inputActiveOptionBorder = registerColor('inputBoxActiveOptionBorder', { dark: '#007ACC', light: '#007ACC', hc: activeContrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields."));
|
||||
export const inputValidationInfoBackground = registerColor('inputValidationInfoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('inputValidationInfoBackground', "Input validation background color for information severity."));
|
||||
export const inputValidationInfoBorder = registerColor('inputValidationInfoBorder', { dark: '#55AAFF', light: '#009CCC', hc: '#6FC3DF' }, nls.localize('inputValidationInfoBorder', "Input validation border color for information severity."));
|
||||
export const inputValidationWarningBackground = registerColor('inputValidationWarningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('inputValidationWarningBackground', "Input validation background color for information warning."));
|
||||
export const inputValidationWarningBorder = registerColor('inputValidationWarningBorder', { dark: '#B89500', light: '#F2CB1D', hc: '#B89500' }, nls.localize('inputValidationWarningBorder', "Input validation border color for warning severity."));
|
||||
export const inputValidationErrorBackground = registerColor('inputValidationErrorBackground', { dark: '#5A1D1D', light: '#F2DEDE', hc: Color.black }, nls.localize('inputValidationErrorBackground', "Input validation background color for error severity."));
|
||||
export const inputValidationErrorBorder = registerColor('inputValidationErrorBorder', { dark: '#BE1100', light: '#E51400', hc: '#BE1100' }, nls.localize('inputValidationErrorBorder', "Input validation border color for error severity."));
|
||||
|
||||
export const selectBackground = registerColor('dropdownBackground', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('dropdownBackground', "Dropdown background."));
|
||||
export const selectForeground = registerColor('dropdownForeground', { dark: '#F0F0F0', light: null, hc: Color.white }, nls.localize('dropdownForeground', "Dropdown foreground."));
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
'use strict';
|
||||
|
||||
import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listActiveSelectionBackground, listActiveSelectionForeground, listFocusAndSelectionBackground, listFocusAndSelectionForeground, listInactiveSelectionBackground, listHoverBackground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, infoBorder, infoBackground, warningBorder, warningBackground, errorBorder, errorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listActiveSelectionBackground, listActiveSelectionForeground, listFocusAndSelectionBackground, listFocusAndSelectionForeground, listInactiveSelectionBackground, listHoverBackground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { SIDE_BAR_SECTION_HEADER_BACKGROUND } from 'vs/workbench/common/theme';
|
||||
|
||||
|
|
@ -40,23 +40,23 @@ export function attachInputBoxStyler(widget: IThemable, themeService: IThemeServ
|
|||
inputBackground?: ColorIdentifier,
|
||||
inputForeground?: ColorIdentifier,
|
||||
inputBorder?: ColorIdentifier,
|
||||
infoBorder?: ColorIdentifier,
|
||||
infoBackground?: ColorIdentifier,
|
||||
warningBorder?: ColorIdentifier,
|
||||
warningBackground?: ColorIdentifier,
|
||||
errorBorder?: ColorIdentifier,
|
||||
errorBackground?: ColorIdentifier
|
||||
inputValidationInfoBorder?: ColorIdentifier,
|
||||
inputValidationInfoBackground?: ColorIdentifier,
|
||||
inputValidationWarningBorder?: ColorIdentifier,
|
||||
inputValidationWarningBackground?: ColorIdentifier,
|
||||
inputValidationErrorBorder?: ColorIdentifier,
|
||||
inputValidationErrorBackground?: ColorIdentifier
|
||||
}): IDisposable {
|
||||
return attachStyler(themeService, widget, {
|
||||
inputBackground: (style && style.inputBackground) || inputBackground,
|
||||
inputForeground: (style && style.inputForeground) || inputForeground,
|
||||
inputBorder: (style && style.inputBorder) || inputBorder,
|
||||
infoBorder: (style && style.infoBorder) || infoBorder,
|
||||
infoBackground: (style && style.infoBackground) || infoBackground,
|
||||
warningBorder: (style && style.warningBorder) || warningBorder,
|
||||
warningBackground: (style && style.warningBackground) || warningBackground,
|
||||
errorBorder: (style && style.errorBorder) || errorBorder,
|
||||
errorBackground: (style && style.errorBackground) || errorBackground
|
||||
inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
|
||||
inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
|
||||
inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || inputValidationWarningBorder,
|
||||
inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || inputValidationWarningBackground,
|
||||
inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || inputValidationErrorBorder,
|
||||
inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -74,24 +74,24 @@ export function attachFindInputBoxStyler(widget: IThemable, themeService: ITheme
|
|||
inputForeground?: ColorIdentifier,
|
||||
inputBorder?: ColorIdentifier,
|
||||
inputActiveOptionBorder?: ColorIdentifier,
|
||||
infoBorder?: ColorIdentifier,
|
||||
infoBackground?: ColorIdentifier,
|
||||
warningBorder?: ColorIdentifier,
|
||||
warningBackground?: ColorIdentifier,
|
||||
errorBorder?: ColorIdentifier,
|
||||
errorBackground?: ColorIdentifier
|
||||
inputValidationInfoBorder?: ColorIdentifier,
|
||||
inputValidationInfoBackground?: ColorIdentifier,
|
||||
inputValidationWarningBorder?: ColorIdentifier,
|
||||
inputValidationWarningBackground?: ColorIdentifier,
|
||||
inputValidationErrorBorder?: ColorIdentifier,
|
||||
inputValidationErrorBackground?: ColorIdentifier
|
||||
}): IDisposable {
|
||||
return attachStyler(themeService, widget, {
|
||||
inputBackground: (style && style.inputBackground) || inputBackground,
|
||||
inputForeground: (style && style.inputForeground) || inputForeground,
|
||||
inputBorder: (style && style.inputBorder) || inputBorder,
|
||||
inputActiveOptionBorder: (style && style.inputActiveOptionBorder) || inputActiveOptionBorder,
|
||||
infoBorder: (style && style.infoBorder) || infoBorder,
|
||||
infoBackground: (style && style.infoBackground) || infoBackground,
|
||||
warningBorder: (style && style.warningBorder) || warningBorder,
|
||||
warningBackground: (style && style.warningBackground) || warningBackground,
|
||||
errorBorder: (style && style.errorBorder) || errorBorder,
|
||||
errorBackground: (style && style.errorBackground) || errorBackground
|
||||
inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
|
||||
inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
|
||||
inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || inputValidationWarningBorder,
|
||||
inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || inputValidationWarningBackground,
|
||||
inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || inputValidationErrorBorder,
|
||||
inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -103,12 +103,12 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
|
|||
inputBackground?: ColorIdentifier,
|
||||
inputForeground?: ColorIdentifier,
|
||||
inputBorder?: ColorIdentifier,
|
||||
infoBorder?: ColorIdentifier,
|
||||
infoBackground?: ColorIdentifier,
|
||||
warningBorder?: ColorIdentifier,
|
||||
warningBackground?: ColorIdentifier,
|
||||
errorBorder?: ColorIdentifier,
|
||||
errorBackground?: ColorIdentifier
|
||||
inputValidationInfoBorder?: ColorIdentifier,
|
||||
inputValidationInfoBackground?: ColorIdentifier,
|
||||
inputValidationWarningBorder?: ColorIdentifier,
|
||||
inputValidationWarningBackground?: ColorIdentifier,
|
||||
inputValidationErrorBorder?: ColorIdentifier,
|
||||
inputValidationErrorBackground?: ColorIdentifier
|
||||
pickerGroupForeground?: ColorIdentifier,
|
||||
pickerGroupBorder?: ColorIdentifier,
|
||||
listFocusBackground?: ColorIdentifier,
|
||||
|
|
@ -133,12 +133,12 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
|
|||
inputBackground: (style && style.inputBackground) || inputBackground,
|
||||
inputForeground: (style && style.inputForeground) || inputForeground,
|
||||
inputBorder: (style && style.inputBorder) || inputBorder,
|
||||
infoBorder: (style && style.infoBorder) || infoBorder,
|
||||
infoBackground: (style && style.infoBackground) || infoBackground,
|
||||
warningBorder: (style && style.warningBorder) || warningBorder,
|
||||
warningBackground: (style && style.warningBackground) || warningBackground,
|
||||
errorBorder: (style && style.errorBorder) || errorBorder,
|
||||
errorBackground: (style && style.errorBackground) || errorBackground,
|
||||
inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || inputValidationInfoBorder,
|
||||
inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || inputValidationInfoBackground,
|
||||
inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || inputValidationWarningBorder,
|
||||
inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || inputValidationWarningBackground,
|
||||
inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || inputValidationErrorBorder,
|
||||
inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || inputValidationErrorBackground,
|
||||
listFocusBackground: (style && style.listFocusBackground) || listFocusBackground,
|
||||
listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || listActiveSelectionBackground,
|
||||
listActiveSelectionForeground: (style && style.listActiveSelectionForeground) || listActiveSelectionForeground,
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
|
|||
import { NOTIFICATIONS_FOREGROUND, NOTIFICATIONS_BACKGROUND } from 'vs/workbench/common/theme';
|
||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
||||
import { contrastBorder, buttonBackground, buttonHoverBackground, widgetShadow, errorBorder, warningBorder, infoBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { contrastBorder, buttonBackground, buttonHoverBackground, widgetShadow, inputValidationErrorBorder, inputValidationWarningBorder, inputValidationInfoBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
||||
import { Color } from 'vs/base/common/color';
|
||||
|
||||
|
|
@ -107,9 +107,9 @@ export class MessageList {
|
|||
this.widgetShadow = theme.getColor(widgetShadow);
|
||||
this.outlineBorder = theme.getColor(contrastBorder);
|
||||
this.buttonBackground = theme.getColor(buttonBackground);
|
||||
this.infoBackground = theme.getColor(infoBorder);
|
||||
this.warningBackground = theme.getColor(warningBorder);
|
||||
this.errorBackground = theme.getColor(errorBorder);
|
||||
this.infoBackground = theme.getColor(inputValidationInfoBorder);
|
||||
this.warningBackground = theme.getColor(inputValidationWarningBorder);
|
||||
this.errorBackground = theme.getColor(inputValidationErrorBorder);
|
||||
|
||||
collector.addRule(`.global-message-list li.message-list-entry .actions-container .message-action .action-button:hover { background-color: ${theme.getColor(buttonHoverBackground)} !important; }`);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue