Skip to content

Commit 8382490

Browse files
author
Benjamin Pasero
committed
theme - get rid of list.focusAndSelectionForeground
1 parent a61ce06 commit 8382490

5 files changed

Lines changed: 3 additions & 7 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@
277277
// "button.foreground": "",
278278

279279
"list.focusAndSelectionBackground": "#08286b",
280-
// "list.focusAndSelectionForeground": "",
281280
"list.activeSelectionBackground": "#011B51",
282281
// "list.activeSelectionForeground": "",
283282
"list.focusBackground": "#08286b",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@
457457
"pickerGroup.foreground": "#A6B39B",
458458
"pickerGroup.border": "#749351",
459459
"list.activeSelectionForeground": "#6c6c6c",
460-
"list.focusAndSelectionForeground": "#6c6c6c",
461460
"list.focusBackground": "#CADEB9",
462461
"list.focusAndSelectionBackground": "#A2B294",
463462
"list.activeSelectionBackground": "#B6C8A7",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@
317317
// "button.foreground": "",
318318

319319
"list.focusAndSelectionBackground": "#005A6F",
320-
// "list.focusAndSelectionForeground": "",
321320
"list.activeSelectionBackground": "#004454",
322321
// "list.activeSelectionForeground": "",
323322
"list.focusBackground": "#005A6F",

‎src/vs/platform/theme/common/colorRegistry.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ export const listActiveSelectionBackground = registerColor('list.activeSelection
148148
export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
149149
export const listActiveSelectionForeground = registerColor('list.activeSelectionForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
150150
export const listFocusAndSelectionBackground = registerColor('list.focusAndSelectionBackground', { dark: '#094771', light: '#3399FF', hc: null }, nls.localize('listFocusAndSelectionBackground', "List/Tree background color for the focused and selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not. This color wins over the individual selection and focus colors."));
151-
export const listFocusAndSelectionForeground = registerColor('list.focusAndSelectionForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('listFocusAndSelectionForeground', "List/Tree foreground color for the focused and selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not. This color wins over the individual selection and focus colors."));
152151
export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
153152
export const listDropBackground = registerColor('list.dropBackground', { dark: '#383B3D', light: '#DDECFF', hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
154153
export const listHighlightForeground = registerColor('list.highlightForeground', { dark: '#219AE4', light: '#186B9E', hc: '#219AE4' }, nls.localize('highlight', 'List/Tree foreground color of the match highlights when searching inside the list/tree.'));

‎src/vs/platform/theme/common/styler.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'use strict';
77

88
import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
9-
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';
9+
import { inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listActiveSelectionBackground, listActiveSelectionForeground, listFocusAndSelectionBackground, listInactiveSelectionBackground, listHoverBackground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground } from 'vs/platform/theme/common/colorRegistry';
1010
import { IDisposable } from 'vs/base/common/lifecycle';
1111
import { SIDE_BAR_SECTION_HEADER_BACKGROUND } from 'vs/workbench/common/theme';
1212

@@ -143,7 +143,7 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
143143
listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || listActiveSelectionBackground,
144144
listActiveSelectionForeground: (style && style.listActiveSelectionForeground) || listActiveSelectionForeground,
145145
listFocusAndSelectionBackground: (style && style.listFocusAndSelectionBackground) || listFocusAndSelectionBackground,
146-
listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listFocusAndSelectionForeground,
146+
listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listActiveSelectionForeground,
147147
listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || listInactiveSelectionBackground,
148148
listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,
149149
listDropBackground: (style && style.listDropBackground) || listDropBackground,
@@ -173,7 +173,7 @@ export function attachListStyler(widget: IThemable, themeService: IThemeService,
173173
listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || listActiveSelectionBackground,
174174
listActiveSelectionForeground: (style && style.listActiveSelectionForeground) || listActiveSelectionForeground,
175175
listFocusAndSelectionBackground: (style && style.listFocusAndSelectionBackground) || listFocusAndSelectionBackground,
176-
listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listFocusAndSelectionForeground,
176+
listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || listActiveSelectionForeground,
177177
listInactiveFocusBackground: (style && style.listInactiveFocusBackground),
178178
listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || listInactiveSelectionBackground,
179179
listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,

0 commit comments

Comments
 (0)