Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build/lib/stylelint/vscode-known-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"--vscode-activityBar-dropBorder",
"--vscode-activityBar-foreground",
"--vscode-activityBar-inactiveForeground",
"--vscode-activityBar-hoverForeground",
"--vscode-activityBar-hoverBackground",
"--vscode-activityBarTop-hoverForeground",
"--vscode-activityBarTop-hoverBackground",
"--vscode-activityBarBadge-background",
"--vscode-activityBarBadge-foreground",
"--vscode-activityBarTop-activeBackground",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,22 @@

.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label.codicon,
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.codicon,
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.codicon {
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.codicon {
color: var(--vscode-activityBar-foreground) !important;
}
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.codicon {
/* hover can use a separate hover foreground and optional hover background */
color: var(--vscode-activityBar-hoverForeground, var(--vscode-activityBar-foreground)) !important;
background-color: var(--vscode-activityBar-hoverBackground, transparent) !important;
}
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label.uri-icon,
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.uri-icon,
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.uri-icon {
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.uri-icon {
background-color: var(--vscode-activityBar-foreground) !important;
}
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.uri-icon {
background-color: var(--vscode-activityBar-hoverBackground, var(--vscode-activityBar-hoverForeground, var(--vscode-activityBar-foreground))) !important;
}


.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before,
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .active-item-indicator:before {
Expand Down
21 changes: 20 additions & 1 deletion src/vs/workbench/common/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,26 @@ export const ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND = registerColor('activityBarTo
export const ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER = registerColor('activityBarTop.dropBorder', ACTIVITY_BAR_TOP_FOREGROUND, localize('activityBarTopDragAndDropBorder', "Drag and drop feedback color for the items in the Activity bar when it is on top / bottom. The activity allows to switch between views of the side bar."));

export const ACTIVITY_BAR_TOP_BACKGROUND = registerColor('activityBarTop.background', null, localize('activityBarTopBackground', "Background color of the activity bar when set to top / bottom."));

export const ACTIVITY_BAR_HOVER_FOREGROUND = registerColor(
'activityBar.hoverForeground',
null,
localize('activityBarHoverForeground', 'Activity bar item foreground color when hovering.')
);
export const ACTIVITY_BAR_HOVER_BACKGROUND = registerColor(
'activityBar.hoverBackground',
null,
localize('activityBarHoverBackground', 'Activity bar item background color when hovering.')
);
export const ACTIVITY_BAR_TOP_HOVER_FOREGROUND = registerColor(
'activityBarTop.hoverForeground',
null,
localize('activityBarTopHoverForeground', 'Activity bar (top/bottom) item foreground color when hovering.')
);
export const ACTIVITY_BAR_TOP_HOVER_BACKGROUND = registerColor(
'activityBarTop.hoverBackground',
null,
localize('activityBarTopHoverBackground', 'Activity bar (top/bottom) item background color when hovering.')
);

// < --- Panels --- >

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ export const COLOR_THEME_DARK_INITIAL_COLORS = {
'activityBar.inactiveForeground': '#868686',
'activityBarBadge.background': '#0078D4',
'activityBarBadge.foreground': '#FFFFFF',
'activityBar.hoverForeground': '#00a0df',
'activityBar.hoverBackground': '#a4dcf3',
'badge.background': '#616161',
'badge.foreground': '#F8F8F8',
'button.background': '#0078D4',
Expand Down Expand Up @@ -202,6 +204,8 @@ export const COLOR_THEME_LIGHT_INITIAL_COLORS = {
'activityBar.inactiveForeground': '#616161',
'activityBarBadge.background': '#005FB8',
'activityBarBadge.foreground': '#FFFFFF',
'activityBar.hoverForeground': '#00a0df',
'activityBar.hoverBackground': '#a4dcf3',
'badge.background': '#CCCCCC',
'badge.foreground': '#3B3B3B',
'button.background': '#005FB8',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import assert from 'assert';
import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
import {
ACTIVITY_BAR_HOVER_FOREGROUND,
ACTIVITY_BAR_HOVER_BACKGROUND,
ACTIVITY_BAR_TOP_HOVER_FOREGROUND,
ACTIVITY_BAR_TOP_HOVER_BACKGROUND
} from '../../../../common/theme.js';

suite('Themes - Activity Bar hover color tokens (smoke)', () => {
ensureNoDisposablesAreLeakedInTestSuite();

test('hover color tokens are registered', () => {
assert.strictEqual(ACTIVITY_BAR_HOVER_FOREGROUND, 'activityBar.hoverForeground');
assert.strictEqual(ACTIVITY_BAR_HOVER_BACKGROUND, 'activityBar.hoverBackground');
assert.strictEqual(ACTIVITY_BAR_TOP_HOVER_FOREGROUND, 'activityBarTop.hoverForeground');
assert.strictEqual(ACTIVITY_BAR_TOP_HOVER_BACKGROUND, 'activityBarTop.hoverBackground');
});
});