maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix #25399

Browse source
This commit is contained in:
Benjamin Pasero 2017-04-27 12:13:03 +02:00
parent 289a3b92f7
commit 6c2730b652
9 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/theme-abyss/themes/abyss-color-theme.json
View file

@ -368,8 +368,8 @@
// Workbench: Activity Bar
"activityBarBackground": "#051336",
// "activityBarForeground": "",
"activityBadgeBackground": "#0063a5",
// "activityBadgeForeground": "",
"activityBarBadgeBackground": "#0063a5",
// "activityBarBadgeForeground": "",
"activityBarDragAndDropBackground": "#25375daa",
// Workbench: Panel

2
extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
View file

@ -13,7 +13,7 @@
"statusBarBackground": "#162257",
"activityBarBackground": "#221a0f",
"activityBarForeground": "#d3af86",
"activityBadgeBackground": "#162257",
"activityBarBadgeBackground": "#162257",
"sideBarBackground": "#131510",
"editorLineHighlight": "#5e452b",
"editorCursor": "#d3af86",

3
extensions/theme-quietlight/themes/quietlight-color-theme.json
View file

@ -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"
}
}

2
extensions/theme-red/themes/Red-color-theme.json
View file

@ -2,7 +2,7 @@
"tokenColors": "./red.tmTheme",
"colors": {
// window
"activityBadgeBackground": "#DB7E58",
"activityBarBadgeBackground": "#DB7E58",
"activityBarBackground": "#580000",
"inactiveTabBackground": "#300a0a",
"activeTabBackground": "#490000",

2
extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
View file

@ -406,7 +406,7 @@
// Workbench: Activity Bar
"activityBarBackground": "#003847",
"activityBarDragAndDropBackground": "#00212B",
"activityBadgeBackground": "#047aa6",
"activityBarBadgeBackground": "#047aa6",
// Workbench: Panel
// "panelBackground": "",

2
extensions/theme-solarized-light/themes/solarized-light-color-theme.json
View file

@ -303,7 +303,7 @@
"activityBarBackground": "#DDD6C1",
"activityBarForeground": "#584c27",
"activityBarDragAndDropBackground": "#EEE8D5",
"activityBadgeBackground": "#B58900",
"activityBarBadgeBackground": "#B58900",
"editorWidgetBackground": "#EEE8D5",
"inputBoxBackground": "#DDD6C1",
"inputBoxForeground": "#586E75",

4
extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
View file

@ -23,8 +23,8 @@
"statusBarBackground": "#001126",
"statusBarNoFolderBackground": "#001126",
"activityBarBackground": "#001733",
"activityBadgeBackground": "#bbdaff",
"activityBadgeForeground": "#001733",
"activityBarBadgeBackground": "#bbdaff",
"activityBarBadgeForeground": "#001733",
"sideBarBackground": "#001c40",
"statusBarDebuggingBackground": "#ffeead",
"terminalAnsiBlack": "#111111",

6
src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
View file

@ -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);

8
src/vs/workbench/common/theme.ts
View file

@ -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."));