Skip to content

Commit b3434bf

Browse files
authored
1 parent 7559012 commit b3434bf

File tree

7 files changed

+30
-8
lines changed

7 files changed

+30
-8
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@
409409
// "activityBar.foreground": "",
410410
// "activityBarBadge.background": "",
411411
// "activityBarBadge.foreground": "",
412+
"activityBarItem.settingsProfilesBackground": "#082877",
412413

413414
// Workbench: Panel
414415
// "panel.background": "",

extensions/theme-defaults/themes/light_vs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$schema": "vscode://schemas/color-theme",
33
"name": "Light (Visual Studio)",
44
"colors": {
5+
"activityBarItem.settingsProfilesBackground": "#4d4d4d",
56
"editor.background": "#FFFFFF",
67
"editor.foreground": "#000000",
78
"editor.inactiveSelectionBackground": "#E5EBF1",

extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"ports.iconRunningProcessForeground": "#369432",
3333
"activityBar.background": "#221a0f",
3434
"activityBar.foreground": "#d3af86",
35+
"activityBarItem.settingsProfilesBackground": "#47351d",
3536
"sideBar.background": "#362712",
3637
"menu.background": "#362712",
3738
"menu.foreground": "#CCCCCC",

extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"statusBar.noFolderBackground": "#001126",
3737
"statusBar.debuggingBackground": "#001126",
3838
"activityBar.background": "#001733",
39+
"activityBarItem.settingsProfilesBackground": "#003271",
3940
"progressBar.background": "#bbdaffcc",
4041
"badge.background": "#bbdaffcc",
4142
"badge.foreground": "#001733",

src/vs/workbench/browser/parts/activitybar/activitybarActions.ts

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IColorTheme, IThemeService, registerThemingParticipant } from 'vs/platf
1919
import { ActivityAction, ActivityActionViewItem, IActivityActionViewItemOptions, IActivityHoverOptions, ICompositeBar, ICompositeBarColors, ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositeBarActions';
2020
import { CATEGORIES } from 'vs/workbench/common/actions';
2121
import { IActivity } from 'vs/workbench/common/activity';
22-
import { ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND } from 'vs/workbench/common/theme';
22+
import { ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_SETTINGS_PROFILE_BACKGROUND, ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND } from 'vs/workbench/common/theme';
2323
import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
2424
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
2525
import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
@@ -504,13 +504,24 @@ registerThemingParticipant((theme, collector) => {
504504
`);
505505
}
506506

507-
const activityBarSettingsProfileHoveFgColor = theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND);
508-
if (activityBarSettingsProfileHoveFgColor) {
507+
const activityBarSettingsProfileBgColor = theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_BACKGROUND);
508+
if (activityBarSettingsProfileBgColor) {
509+
collector.addRule(`
510+
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label.profile-activity-item,
511+
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label.profile-activity-item,
512+
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item .action-label.profile-activity-item {
513+
background-color: ${activityBarSettingsProfileBgColor} !important;
514+
}
515+
`);
516+
}
517+
518+
const activityBarSettingsProfileHoverFgColor = theme.getColor(ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND);
519+
if (activityBarSettingsProfileHoverFgColor) {
509520
collector.addRule(`
510521
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.active .action-label.profile-activity-item,
511522
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus .action-label.profile-activity-item,
512523
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:hover .action-label.profile-activity-item {
513-
color: ${activityBarSettingsProfileHoveFgColor} !important;
524+
color: ${activityBarSettingsProfileHoverFgColor} !important;
514525
}
515526
`);
516527
}

src/vs/workbench/browser/parts/activitybar/media/activityaction.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@
178178

179179
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-label.profile-activity-item {
180180
height: 20px;
181-
width: 28px;
182-
margin: 14px 10px;
181+
width: 32px;
182+
margin: 14px 8px;
183183
padding: 0px;
184184
justify-content: center;
185185
align-items: center;
186-
font-size: 12px;
186+
font-size: 14px;
187187
line-height: 16px;
188-
border: 2px solid;
188+
border-radius: 8px;
189189
}
190190

191191
/* Right aligned */

src/vs/workbench/common/theme.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,13 @@ export const ACTIVITY_BAR_SETTINGS_PROFILE_HOVER_FOREGROUND = registerColor('act
639639
hcLight: ACTIVITY_BAR_FOREGROUND
640640
}, localize('activityBarItem.settingsProfilesHoverForeground', "Foreground color for the settings profile entry on the activity bar when hovering."));
641641

642+
export const ACTIVITY_BAR_SETTINGS_PROFILE_BACKGROUND = registerColor('activityBarItem.settingsProfilesBackground', {
643+
dark: lighten(ACTIVITY_BAR_BACKGROUND, 0.5),
644+
light: darken(ACTIVITY_BAR_BACKGROUND, 0.12),
645+
hcDark: null,
646+
hcLight: null
647+
}, localize('statusBarItemSettingsProfileBackground', "Background color for the settings profile entry on the activity bar."));
648+
642649
// < --- Remote --- >
643650

644651
export const STATUS_BAR_HOST_NAME_BACKGROUND = registerColor('statusBarItem.remoteBackground', {

0 commit comments

Comments
 (0)