Skip to content

Commit 0f090fc

Browse files
author
Benjamin Pasero
committed
1 parent 9f658fd commit 0f090fc

10 files changed

Lines changed: 143 additions & 144 deletions

File tree

‎extensions/theme-abyss/themes/abyss-color-theme.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,19 +254,19 @@
254254
// Base
255255
// "foreground": "",
256256
"focusBorder": "#596F99",
257-
"infoBorder": "#384078",
258-
"infoBackground": "#051336",
259-
"warningBackground": "#5B7E7A",
260-
"warningBorder": "#5B7E7A",
261-
"errorBackground": "#A22D44",
262-
"errorBorder": "#AB395B",
263257

264258
// "widgetShadow": "",
265259

266260
"inputBoxBackground": "#181f2f",
267261
// "inputBoxBorder": "",
268262
// "inputBoxForeground": "",
269263
"inputBoxActiveOptionBorder": "#1D4A87",
264+
"inputValidationInfoBorder": "#384078",
265+
"inputValidationInfoBackground": "#051336",
266+
"inputValidationWarningBackground": "#5B7E7A",
267+
"inputValidationWarningBorder": "#5B7E7A",
268+
"inputValidationErrorBackground": "#A22D44",
269+
"inputValidationErrorBorder": "#AB395B",
270270

271271
// "dropdownBackground": "#181f2f",
272272
// "dropdownForeground": "",

‎extensions/theme-red/themes/Red-color-theme.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
"dropdownBackground": "#580000",
3939
"inputBoxBackground": "#580000",
4040
"inputBoxActiveOptionBorder": "#cc0000",
41+
"inputValidationInfoBackground": "#550000",
42+
"inputValidationInfoBorder": "#773333"
4143
"listHoverBackground": "#800000",
4244
"listActiveSelectionBackground": "#700000",
4345
"listInactiveSelectionBackground": "#770000",
@@ -47,8 +49,6 @@
4749
"notificationsBackground": "#662222",
4850
"pickerGroupForeground": "#cc9999",
4951
"pickerGroupBorder": "#ff000033",
50-
"infoBackground": "#550000",
51-
"infoBorder": "#773333"
5252
},
5353
"name": "Red"
5454
}

‎extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,18 +296,18 @@
296296
// Base
297297
// "foreground": "",
298298
"focusBorder": "#2AA19899",
299-
"infoBorder": "#384078",
300-
"infoBackground": "#051336",
301-
"warningBackground": "#5B7E7A",
302-
"warningBorder": "#5B7E7A",
303-
"errorBackground": "#A22D44",
304-
"errorBorder": "#AB395B",
305299

306300
// "widgetShadow": "",
307301

308302
"inputBoxBackground": "#003847",
309303
"inputBoxForeground": "#93A1A1",
310304
"inputBoxActiveOptionBorder": "#2AA19899",
305+
"inputValidationInfoBorder": "#384078",
306+
"inputValidationInfoBackground": "#051336",
307+
"inputValidationWarningBackground": "#5B7E7A",
308+
"inputValidationWarningBorder": "#5B7E7A",
309+
"inputValidationErrorBackground": "#A22D44",
310+
"inputValidationErrorBorder": "#AB395B",
311311

312312
"dropdownBackground": "#00212B",
313313
"dropdownBorder": "#2AA19899",

‎src/vs/base/browser/ui/findinput/findInput.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ export class FindInput extends Widget {
5050
private inputForeground: Color;
5151
private inputBorder: Color;
5252

53-
private infoBorder: Color;
54-
private infoBackground: Color;
55-
private warningBorder: Color;
56-
private warningBackground: Color;
57-
private errorBorder: Color;
58-
private errorBackground: Color;
53+
private inputValidationInfoBorder: Color;
54+
private inputValidationInfoBackground: Color;
55+
private inputValidationWarningBorder: Color;
56+
private inputValidationWarningBackground: Color;
57+
private inputValidationErrorBorder: Color;
58+
private inputValidationErrorBackground: Color;
5959

6060
private regex: RegexCheckbox;
6161
private wholeWords: WholeWordsCheckbox;
@@ -91,12 +91,12 @@ export class FindInput extends Widget {
9191
this.inputForeground = options.inputForeground;
9292
this.inputBorder = options.inputBorder;
9393

94-
this.infoBorder = options.infoBorder;
95-
this.infoBackground = options.infoBackground;
96-
this.warningBorder = options.warningBorder;
97-
this.warningBackground = options.warningBackground;
98-
this.errorBorder = options.errorBorder;
99-
this.errorBackground = options.errorBackground;
94+
this.inputValidationInfoBorder = options.inputValidationInfoBorder;
95+
this.inputValidationInfoBackground = options.inputValidationInfoBackground;
96+
this.inputValidationWarningBorder = options.inputValidationWarningBorder;
97+
this.inputValidationWarningBackground = options.inputValidationWarningBackground;
98+
this.inputValidationErrorBorder = options.inputValidationErrorBorder;
99+
this.inputValidationErrorBackground = options.inputValidationErrorBackground;
100100

101101
this.regex = null;
102102
this.wholeWords = null;
@@ -168,12 +168,12 @@ export class FindInput extends Widget {
168168
this.inputForeground = styles.inputForeground;
169169
this.inputBorder = styles.inputBorder;
170170

171-
this.infoBackground = styles.infoBackground;
172-
this.infoBorder = styles.infoBorder;
173-
this.warningBackground = styles.warningBackground;
174-
this.warningBorder = styles.warningBorder;
175-
this.errorBackground = styles.errorBackground;
176-
this.errorBorder = styles.errorBorder;
171+
this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
172+
this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
173+
this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
174+
this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
175+
this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
176+
this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
177177

178178
this.applyStyles();
179179
}
@@ -191,12 +191,12 @@ export class FindInput extends Widget {
191191
inputBackground: this.inputBackground,
192192
inputForeground: this.inputForeground,
193193
inputBorder: this.inputBorder,
194-
infoBackground: this.infoBackground,
195-
infoBorder: this.infoBorder,
196-
warningBackground: this.warningBackground,
197-
warningBorder: this.warningBorder,
198-
errorBackground: this.errorBackground,
199-
errorBorder: this.errorBorder
194+
inputValidationInfoBackground: this.inputValidationInfoBackground,
195+
inputValidationInfoBorder: this.inputValidationInfoBorder,
196+
inputValidationWarningBackground: this.inputValidationWarningBackground,
197+
inputValidationWarningBorder: this.inputValidationWarningBorder,
198+
inputValidationErrorBackground: this.inputValidationErrorBackground,
199+
inputValidationErrorBorder: this.inputValidationErrorBorder
200200
};
201201
this.inputBox.style(inputBoxStyles);
202202
}
@@ -268,12 +268,12 @@ export class FindInput extends Widget {
268268
inputBackground: this.inputBackground,
269269
inputForeground: this.inputForeground,
270270
inputBorder: this.inputBorder,
271-
infoBackground: this.infoBackground,
272-
infoBorder: this.infoBorder,
273-
warningBackground: this.warningBackground,
274-
warningBorder: this.warningBorder,
275-
errorBackground: this.errorBackground,
276-
errorBorder: this.errorBorder
271+
inputValidationInfoBackground: this.inputValidationInfoBackground,
272+
inputValidationInfoBorder: this.inputValidationInfoBorder,
273+
inputValidationWarningBackground: this.inputValidationWarningBackground,
274+
inputValidationWarningBorder: this.inputValidationWarningBorder,
275+
inputValidationErrorBackground: this.inputValidationErrorBackground,
276+
inputValidationErrorBorder: this.inputValidationErrorBorder
277277
}));
278278

279279
this.regex = this._register(new RegexCheckbox({

‎src/vs/base/browser/ui/inputbox/inputBox.ts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ export interface IInputBoxStyles {
3535
inputBackground?: Color;
3636
inputForeground?: Color;
3737
inputBorder?: Color;
38-
infoBorder?: Color;
39-
infoBackground?: Color;
40-
warningBorder?: Color;
41-
warningBackground?: Color;
42-
errorBorder?: Color;
43-
errorBackground?: Color;
38+
inputValidationInfoBorder?: Color;
39+
inputValidationInfoBackground?: Color;
40+
inputValidationWarningBorder?: Color;
41+
inputValidationWarningBackground?: Color;
42+
inputValidationErrorBorder?: Color;
43+
inputValidationErrorBackground?: Color;
4444
}
4545

4646
export interface IInputValidator {
@@ -72,12 +72,12 @@ export interface IRange {
7272
const defaultOpts = {
7373
inputBackground: Color.fromHex('#3C3C3C'),
7474
inputForeground: Color.fromHex('#CCCCCC'),
75-
infoBorder: Color.fromHex('#55AAFF'),
76-
infoBackground: Color.fromHex('#063B49'),
77-
warningBorder: Color.fromHex('#B89500'),
78-
warningBackground: Color.fromHex('#352A05'),
79-
errorBorder: Color.fromHex('#BE1100'),
80-
errorBackground: Color.fromHex('#5A1D1D')
75+
inputValidationInfoBorder: Color.fromHex('#55AAFF'),
76+
inputValidationInfoBackground: Color.fromHex('#063B49'),
77+
inputValidationWarningBorder: Color.fromHex('#B89500'),
78+
inputValidationWarningBackground: Color.fromHex('#352A05'),
79+
inputValidationErrorBorder: Color.fromHex('#BE1100'),
80+
inputValidationErrorBackground: Color.fromHex('#5A1D1D')
8181
};
8282

8383
export class InputBox extends Widget {
@@ -99,12 +99,12 @@ export class InputBox extends Widget {
9999
private inputForeground: Color;
100100
private inputBorder: Color;
101101

102-
private infoBorder: Color;
103-
private infoBackground: Color;
104-
private warningBorder: Color;
105-
private warningBackground: Color;
106-
private errorBorder: Color;
107-
private errorBackground: Color;
102+
private inputValidationInfoBorder: Color;
103+
private inputValidationInfoBackground: Color;
104+
private inputValidationWarningBorder: Color;
105+
private inputValidationWarningBackground: Color;
106+
private inputValidationErrorBorder: Color;
107+
private inputValidationErrorBackground: Color;
108108

109109
private _onDidChange = this._register(new Emitter<string>());
110110
public onDidChange: Event<string> = this._onDidChange.event;
@@ -127,12 +127,12 @@ export class InputBox extends Widget {
127127
this.inputForeground = this.options.inputForeground;
128128
this.inputBorder = this.options.inputBorder;
129129

130-
this.infoBorder = this.options.infoBorder;
131-
this.infoBackground = this.options.infoBackground;
132-
this.warningBorder = this.options.warningBorder;
133-
this.warningBackground = this.options.warningBackground;
134-
this.errorBorder = this.options.errorBorder;
135-
this.errorBackground = this.options.errorBackground;
130+
this.inputValidationInfoBorder = this.options.inputValidationInfoBorder;
131+
this.inputValidationInfoBackground = this.options.inputValidationInfoBackground;
132+
this.inputValidationWarningBorder = this.options.inputValidationWarningBorder;
133+
this.inputValidationWarningBackground = this.options.inputValidationWarningBackground;
134+
this.inputValidationErrorBorder = this.options.inputValidationErrorBorder;
135+
this.inputValidationErrorBackground = this.options.inputValidationErrorBackground;
136136

137137
if (this.options.validationOptions) {
138138
this.validation = this.options.validationOptions.validation;
@@ -350,9 +350,9 @@ export class InputBox extends Widget {
350350

351351
private stylesForType(type: MessageType): { border: Color; background: Color } {
352352
switch (type) {
353-
case MessageType.INFO: return { border: this.infoBorder, background: this.infoBackground };
354-
case MessageType.WARNING: return { border: this.warningBorder, background: this.warningBackground };
355-
default: return { border: this.errorBorder, background: this.errorBackground };
353+
case MessageType.INFO: return { border: this.inputValidationInfoBorder, background: this.inputValidationInfoBackground };
354+
case MessageType.WARNING: return { border: this.inputValidationWarningBorder, background: this.inputValidationWarningBackground };
355+
default: return { border: this.inputValidationErrorBorder, background: this.inputValidationErrorBackground };
356356
}
357357
}
358358

@@ -445,12 +445,12 @@ export class InputBox extends Widget {
445445
this.inputForeground = styles.inputForeground;
446446
this.inputBorder = styles.inputBorder;
447447

448-
this.infoBackground = styles.infoBackground;
449-
this.infoBorder = styles.infoBorder;
450-
this.warningBackground = styles.warningBackground;
451-
this.warningBorder = styles.warningBorder;
452-
this.errorBackground = styles.errorBackground;
453-
this.errorBorder = styles.errorBorder;
448+
this.inputValidationInfoBackground = styles.inputValidationInfoBackground;
449+
this.inputValidationInfoBorder = styles.inputValidationInfoBorder;
450+
this.inputValidationWarningBackground = styles.inputValidationWarningBackground;
451+
this.inputValidationWarningBorder = styles.inputValidationWarningBorder;
452+
this.inputValidationErrorBackground = styles.inputValidationErrorBackground;
453+
this.inputValidationErrorBorder = styles.inputValidationErrorBorder;
454454

455455
this.applyStyles();
456456
}

‎src/vs/base/parts/quickopen/browser/quickOpenWidget.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ export class QuickOpenWidget implements IModelProvider {
171171
inputBackground: this.styles.inputBackground,
172172
inputForeground: this.styles.inputForeground,
173173
inputBorder: this.styles.inputBorder,
174-
infoBackground: this.styles.infoBackground,
175-
infoBorder: this.styles.infoBorder,
176-
warningBackground: this.styles.warningBackground,
177-
warningBorder: this.styles.warningBorder,
178-
errorBackground: this.styles.errorBackground,
179-
errorBorder: this.styles.errorBorder
174+
inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
175+
inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
176+
inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
177+
inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
178+
inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
179+
inputValidationErrorBorder: this.styles.inputValidationErrorBorder
180180
});
181181

182182
// ARIA
@@ -356,12 +356,12 @@ export class QuickOpenWidget implements IModelProvider {
356356
inputBackground: this.styles.inputBackground,
357357
inputForeground: this.styles.inputForeground,
358358
inputBorder: this.styles.inputBorder,
359-
infoBackground: this.styles.infoBackground,
360-
infoBorder: this.styles.infoBorder,
361-
warningBackground: this.styles.warningBackground,
362-
warningBorder: this.styles.warningBorder,
363-
errorBackground: this.styles.errorBackground,
364-
errorBorder: this.styles.errorBorder
359+
inputValidationInfoBackground: this.styles.inputValidationInfoBackground,
360+
inputValidationInfoBorder: this.styles.inputValidationInfoBorder,
361+
inputValidationWarningBackground: this.styles.inputValidationWarningBackground,
362+
inputValidationWarningBorder: this.styles.inputValidationWarningBorder,
363+
inputValidationErrorBackground: this.styles.inputValidationErrorBackground,
364+
inputValidationErrorBorder: this.styles.inputValidationErrorBorder
365365
});
366366
}
367367

‎src/vs/editor/contrib/find/browser/findWidget.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { CONTEXT_FIND_INPUT_FOCUSSED } from 'vs/editor/contrib/find/common/findC
2626
import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
2727
import { Color } from 'vs/base/common/color';
2828
import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions';
29-
import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, infoBackground, infoBorder, warningBackground, warningBorder, errorBackground, errorBorder } from 'vs/platform/theme/common/colorRegistry';
29+
import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
3030

3131
export interface IFindController {
3232
replace(): void;
@@ -353,12 +353,12 @@ export class FindWidget extends Widget implements IOverlayWidget {
353353
inputBackground: theme.getColor(inputBackground),
354354
inputForeground: theme.getColor(inputForeground),
355355
inputBorder: theme.getColor(inputBorder),
356-
infoBackground: theme.getColor(infoBackground),
357-
infoBorder: theme.getColor(infoBorder),
358-
warningBackground: theme.getColor(warningBackground),
359-
warningBorder: theme.getColor(warningBorder),
360-
errorBackground: theme.getColor(errorBackground),
361-
errorBorder: theme.getColor(errorBorder)
356+
inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
357+
inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
358+
inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
359+
inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
360+
inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
361+
inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder)
362362
};
363363
this._findInput.style(inputStyles);
364364
this._replaceInputBox.style(inputStyles);

0 commit comments

Comments
 (0)