Skip to content

Commit c005fc3

Browse files
authored
1 parent b0f0dcb commit c005fc3

File tree

7 files changed

+56
-10
lines changed

7 files changed

+56
-10
lines changed

build/lib/stylelint/vscode-known-variables.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@
461461
"--vscode-notificationsWarningIcon-foreground",
462462
"--vscode-outputView-background",
463463
"--vscode-outputViewStickyScroll-background",
464+
"--vscode-activityBarTop-activeBorder",
465+
"--vscode-activityBarTop-foreground",
464466
"--vscode-panel-background",
465467
"--vscode-panel-border",
466468
"--vscode-panel-dropBorder",

src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
flex: 1;
1919
}
2020

21+
.monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
22+
.monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
23+
border-top-color: var(--vscode-panelTitle-activeBorder) !important;
24+
}
25+
2126
.monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
2227
.monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .action-label {
2328
color: var(--vscode-sideBarTitle-foreground) !important;

src/vs/workbench/browser/parts/media/paneCompositePart.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,6 @@
232232
.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
233233
border-top-color: var(--vscode-focusBorder) !important;
234234
}
235-
.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
236-
.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
237-
border-top-color: var(--vscode-panelTitle-activeBorder) !important;
238-
}
239235

240236
.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label,
241237
.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label {

src/vs/workbench/browser/parts/panel/media/panelpart.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
background-color: inherit;
4848
}
4949

50+
.monaco-workbench .part.panel > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
51+
.monaco-workbench .part.panel > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
52+
border-top-color: var(--vscode-panelTitle-activeBorder) !important;
53+
}
54+
5055
.monaco-workbench .part.panel > .title > .composite-bar-container >.composite-bar > .monaco-action-bar .action-item:focus .action-label,
5156
.monaco-workbench .part.panel > .title > .composite-bar-container >.composite-bar > .monaco-action-bar .action-item:hover .action-label {
5257
color: var(--vscode-panelTitle-activeForeground) !important;

src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@
6060
height: 16px;
6161
}
6262

63+
.monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
64+
.monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
65+
border-top-color: var(--vscode-activityBarTop-activeBorder) !important;
66+
}
67+
68+
.monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
69+
.monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .action-label {
70+
color: var(--vscode-activityBarTop-foreground) !important;
71+
}
72+
6373
.monaco-workbench .sidebar.pane-composite-part > .title > .composite-bar-container {
6474
flex: 1;
6575
}

src/vs/workbench/browser/parts/sidebar/sidebarPart.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1313
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1414
import { IThemeService } from 'vs/platform/theme/common/themeService';
1515
import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
16-
import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from 'vs/workbench/common/theme';
16+
import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER } from 'vs/workbench/common/theme';
1717
import { INotificationService } from 'vs/platform/notification/common/notification';
1818
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
1919
import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
@@ -183,12 +183,12 @@ export class SidebarPart extends AbstractPaneCompositePart {
183183
colors: theme => ({
184184
activeBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
185185
inactiveBackgroundColor: theme.getColor(SIDE_BAR_BACKGROUND),
186-
activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
187-
activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
188-
inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
186+
activeBorderBottomColor: theme.getColor(ACTIVITY_BAR_TOP_ACTIVE_BORDER),
187+
activeForegroundColor: theme.getColor(ACTIVITY_BAR_TOP_FOREGROUND),
188+
inactiveForegroundColor: theme.getColor(ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND),
189189
badgeBackground: theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND),
190190
badgeForeground: theme.getColor(ACTIVITY_BAR_BADGE_FOREGROUND),
191-
dragAndDropBorder: theme.getColor(PANEL_DRAG_AND_DROP_BORDER)
191+
dragAndDropBorder: theme.getColor(ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER)
192192
}),
193193
compact: true
194194
};

src/vs/workbench/common/theme.ts

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ export const PANEL_DRAG_AND_DROP_BORDER = registerColor('panel.dropBorder', {
365365
hcLight: PANEL_ACTIVE_TITLE_FOREGROUND
366366
}, localize('panelDragAndDropBorder', "Drag and drop feedback color for the panel titles. Panels are shown below the editor area and contain views like output and integrated terminal."));
367367

368-
369368
export const PANEL_SECTION_DRAG_AND_DROP_BACKGROUND = registerColor('panelSection.dropBackground', {
370369
dark: EDITOR_DRAG_AND_DROP_BACKGROUND,
371370
light: EDITOR_DRAG_AND_DROP_BACKGROUND,
@@ -685,6 +684,35 @@ export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadge.for
685684
hcLight: Color.white
686685
}, localize('activityBarBadgeForeground', "Activity notification badge foreground color. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
687686

687+
export const ACTIVITY_BAR_TOP_FOREGROUND = registerColor('activityBarTop.foreground', {
688+
dark: '#E7E7E7',
689+
light: '#424242',
690+
hcDark: Color.white,
691+
hcLight: editorForeground
692+
}, localize('activityBarTop', "Active foreground color of the item in the Activity bar when it is on top. The activity allows to switch between views of the side bar."));
693+
694+
export const ACTIVITY_BAR_TOP_ACTIVE_BORDER = registerColor('activityBarTop.activeBorder', {
695+
dark: ACTIVITY_BAR_TOP_FOREGROUND,
696+
light: ACTIVITY_BAR_TOP_FOREGROUND,
697+
hcDark: contrastBorder,
698+
hcLight: '#B5200D'
699+
}, localize('activityBarTopActiveFocusBorder', "Focus border color for the active item in the Activity bar when it is on top. The activity allows to switch between views of the side bar."));
700+
701+
export const ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND = registerColor('activityBarTop.inactiveForeground', {
702+
dark: transparent(ACTIVITY_BAR_TOP_FOREGROUND, 0.6),
703+
light: transparent(ACTIVITY_BAR_TOP_FOREGROUND, 0.75),
704+
hcDark: Color.white,
705+
hcLight: editorForeground
706+
}, localize('activityBarTopInActiveForeground', "Inactive foreground color of the item in the Activity bar when it is on top. The activity allows to switch between views of the side bar."));
707+
708+
export const ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER = registerColor('activityBarTop.dropBorder', {
709+
dark: ACTIVITY_BAR_TOP_FOREGROUND,
710+
light: ACTIVITY_BAR_TOP_FOREGROUND,
711+
hcDark: ACTIVITY_BAR_TOP_FOREGROUND,
712+
hcLight: ACTIVITY_BAR_TOP_FOREGROUND
713+
}, localize('activityBarTopDragAndDropBorder', "Drag and drop feedback color for the items in the Activity bar when it is on top. The activity allows to switch between views of the side bar."));
714+
715+
688716
// < --- Profiles --- >
689717

690718
export const PROFILE_BADGE_BACKGROUND = registerColor('profileBadge.background', {

0 commit comments

Comments
 (0)