diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index 242a1865102..45d42d5c496 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -368,8 +368,8 @@ // Workbench: Activity Bar "activityBarBackground": "#051336", // "activityBarForeground": "", - "activityBadgeBackground": "#0063a5", - // "activityBadgeForeground": "", + "activityBarBadgeBackground": "#0063a5", + // "activityBarBadgeForeground": "", "activityBarDragAndDropBackground": "#25375daa", // Workbench: Panel diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json index 2d6b0a7fdd0..c21b60208fb 100644 --- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json +++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json @@ -13,7 +13,7 @@ "statusBarBackground": "#162257", "activityBarBackground": "#221a0f", "activityBarForeground": "#d3af86", - "activityBadgeBackground": "#162257", + "activityBarBadgeBackground": "#162257", "sideBarBackground": "#131510", "editorLineHighlight": "#5e452b", "editorCursor": "#d3af86", diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json index a267b0ed732..20c4bfddc78 100644 --- a/extensions/theme-quietlight/themes/quietlight-color-theme.json +++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json @@ -458,7 +458,6 @@ "pickerGroupForeground": "#A6B39B", "pickerGroupBorder": "#749351", "statusBarBackground": "#749351", - "activityBadgeBackground": "#749351", "activityBarForeground": "#FFFFFF", "listActiveSelectionForeground": "#6c6c6c", "listFocusAndSelectionForeground": "#6c6c6c", @@ -482,6 +481,6 @@ "peekViewEditorBackground": "#F2F8FC", "peekViewResultsBackground": "#F2F8FC", "peekViewResultsMatchHighlight": "#93C6D6", - "activityBadgeBackground": "#705697" + "activityBarBadgeBackground": "#705697" } } \ No newline at end of file diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json index 2b01ce2b1a9..bd4e7035dab 100644 --- a/extensions/theme-red/themes/Red-color-theme.json +++ b/extensions/theme-red/themes/Red-color-theme.json @@ -2,7 +2,7 @@ "tokenColors": "./red.tmTheme", "colors": { // window - "activityBadgeBackground": "#DB7E58", + "activityBarBadgeBackground": "#DB7E58", "activityBarBackground": "#580000", "inactiveTabBackground": "#300a0a", "activeTabBackground": "#490000", diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index b1142c43cc1..7d2195f05b4 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -406,7 +406,7 @@ // Workbench: Activity Bar "activityBarBackground": "#003847", "activityBarDragAndDropBackground": "#00212B", - "activityBadgeBackground": "#047aa6", + "activityBarBadgeBackground": "#047aa6", // Workbench: Panel // "panelBackground": "", diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json index f8c484e391c..a9ca57c446c 100644 --- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json +++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json @@ -303,7 +303,7 @@ "activityBarBackground": "#DDD6C1", "activityBarForeground": "#584c27", "activityBarDragAndDropBackground": "#EEE8D5", - "activityBadgeBackground": "#B58900", + "activityBarBadgeBackground": "#B58900", "editorWidgetBackground": "#EEE8D5", "inputBoxBackground": "#DDD6C1", "inputBoxForeground": "#586E75", diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json index 70836824444..e4a43c2d185 100644 --- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json +++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json @@ -23,8 +23,8 @@ "statusBarBackground": "#001126", "statusBarNoFolderBackground": "#001126", "activityBarBackground": "#001733", - "activityBadgeBackground": "#bbdaff", - "activityBadgeForeground": "#001733", + "activityBarBadgeBackground": "#bbdaff", + "activityBarBadgeForeground": "#001733", "sideBarBackground": "#001c40", "statusBarDebuggingBackground": "#ffeead", "terminalAnsiBlack": "#111111", diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 5d39239f5a2..8873c77e160 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -24,7 +24,7 @@ import { dispose } from 'vs/base/common/lifecycle'; import { IViewletService, } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IPartService, Parts } from 'vs/workbench/services/part/common/partService'; import { IThemeService, ITheme, registerThemingParticipant, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; -import { ACTIVITY_BADGE_FOREGROUND, ACTIVITY_BADGE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_FOREGROUND } from 'vs/workbench/common/theme'; +import { ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND, ACTIVITY_BAR_FOREGROUND } from 'vs/workbench/common/theme'; import { highContrastBorder, highContrastOutline, focus } from 'vs/platform/theme/common/colorRegistry'; export class ActivityAction extends Action { @@ -174,8 +174,8 @@ export class ActivityActionItem extends ThemableActivityActionItem { // Badge if (this.$badgeContent) { - const badgeForeground = theme.getColor(ACTIVITY_BADGE_FOREGROUND); - const badgeBackground = theme.getColor(ACTIVITY_BADGE_BACKGROUND); + const badgeForeground = theme.getColor(ACTIVITY_BAR_BADGE_FOREGROUND); + const badgeBackground = theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND); const hcBorder = theme.getColor(highContrastBorder); this.$badgeContent.style('color', badgeForeground ? badgeForeground.toString() : null); diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index ac7e22718ac..bcea67e0434 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.ts @@ -194,17 +194,17 @@ export const ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND = registerColor('activityBarD hc: '#403F3F' }, nls.localize('activityBarDragAndDropBackground', "Drag and drop feedback color for the activity bar items. The activity bar is showing on the far left or right and allows to switch between views of the side bar.")); -export const ACTIVITY_BADGE_BACKGROUND = registerColor('activityBadgeBackground', { +export const ACTIVITY_BAR_BADGE_BACKGROUND = registerColor('activityBarBadgeBackground', { dark: '#007ACC', light: '#007ACC', hc: '#000000' -}, nls.localize('activityBadgeBackground', "Activity notification badge background color. The activity bar is showing on the far left or right and allows to switch between views of the side bar.")); +}, nls.localize('activityBarBadgeBackground', "Activity notification badge background color. The activity bar is showing on the far left or right and allows to switch between views of the side bar.")); -export const ACTIVITY_BADGE_FOREGROUND = registerColor('activityBadgeForeground', { +export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadgeForeground', { dark: Color.white, light: Color.white, hc: Color.white -}, nls.localize('activityBadgeForeground', "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.")); +}, nls.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."));