mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from master
This commit is contained in:
Raj Musuku
@@ -4,7 +4,7 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as nls from 'vs/nls';
|
||||
import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, listActiveSelectionForeground, listActiveSelectionBackground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { Disposable } from 'vs/base/common/lifecycle';
|
||||
import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
|
||||
import { Color } from 'vs/base/common/color';
|
||||
@@ -60,24 +60,48 @@ export const TAB_ACTIVE_BORDER = registerColor('tab.activeBorder', {
|
||||
hc: null
|
||||
}, nls.localize('tabActiveBorder', "Border on the bottom of an active tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_ACTIVE_BORDER_TOP = registerColor('tab.activeBorderTop', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('tabActiveBorderTop', "Border to the top of an active tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_UNFOCUSED_ACTIVE_BORDER = registerColor('tab.unfocusedActiveBorder', {
|
||||
dark: transparent(TAB_ACTIVE_BORDER, 0.5),
|
||||
light: transparent(TAB_ACTIVE_BORDER, 0.7),
|
||||
hc: null
|
||||
}, nls.localize('tabActiveUnfocusedBorder', "Border on the bottom of an active tab in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_ACTIVE_BORDER_TOP = registerColor('tab.activeBorderTop', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('tabActiveBorderTop', "Border to the top of an active tab. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_UNFOCUSED_ACTIVE_BORDER_TOP = registerColor('tab.unfocusedActiveBorderTop', {
|
||||
dark: transparent(TAB_ACTIVE_BORDER_TOP, 0.5),
|
||||
light: transparent(TAB_ACTIVE_BORDER_TOP, 0.7),
|
||||
hc: null
|
||||
}, nls.localize('tabActiveUnfocusedBorderTop', "Border to the top of an active tab in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_ACTIVE_MODIFIED_BORDER = registerColor('tab.activeModifiedBorder', {
|
||||
dark: '#3399CC',
|
||||
light: '#33AAEE',
|
||||
hc: null
|
||||
}, nls.localize('tabActiveModifiedBorder', "Border on the top of modified (dirty) active tabs in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_INACTIVE_MODIFIED_BORDER = registerColor('tab.inactiveModifiedBorder', {
|
||||
dark: transparent(TAB_ACTIVE_MODIFIED_BORDER, 0.5),
|
||||
light: transparent(TAB_ACTIVE_MODIFIED_BORDER, 0.5),
|
||||
hc: Color.white
|
||||
}, nls.localize('tabInactiveModifiedBorder', "Border on the top of modified (dirty) inactive tabs in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER = registerColor('tab.unfocusedActiveModifiedBorder', {
|
||||
dark: transparent(TAB_ACTIVE_MODIFIED_BORDER, 0.5),
|
||||
light: transparent(TAB_ACTIVE_MODIFIED_BORDER, 0.7),
|
||||
hc: Color.white
|
||||
}, nls.localize('unfocusedActiveModifiedBorder', "Border on the top of modified (dirty) active tabs in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER = registerColor('tab.unfocusedInactiveModifiedBorder', {
|
||||
dark: transparent(TAB_INACTIVE_MODIFIED_BORDER, 0.5),
|
||||
light: transparent(TAB_INACTIVE_MODIFIED_BORDER, 0.5),
|
||||
hc: Color.white
|
||||
}, nls.localize('unfocusedINactiveModifiedBorder', "Border on the top of modified (dirty) inactive tabs in an unfocused group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
export const TAB_HOVER_BORDER = registerColor('tab.hoverBorder', {
|
||||
dark: null,
|
||||
light: null,
|
||||
@@ -98,7 +122,7 @@ export const TAB_ACTIVE_FOREGROUND = registerColor('tab.activeForeground', {
|
||||
|
||||
export const TAB_INACTIVE_FOREGROUND = registerColor('tab.inactiveForeground', {
|
||||
dark: transparent(TAB_ACTIVE_FOREGROUND, 0.5),
|
||||
light: transparent(TAB_ACTIVE_FOREGROUND, 0.5),
|
||||
light: transparent(TAB_ACTIVE_FOREGROUND, 0.7),
|
||||
hc: Color.white
|
||||
}, nls.localize('tabInactiveForeground', "Inactive tab foreground color in an active group. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups."));
|
||||
|
||||
@@ -117,6 +141,12 @@ export const TAB_UNFOCUSED_INACTIVE_FOREGROUND = registerColor('tab.unfocusedIna
|
||||
|
||||
// < --- Editors --- >
|
||||
|
||||
export const EDITOR_PANE_BACKGROUND = registerColor('editorPane.background', {
|
||||
dark: editorBackground,
|
||||
light: editorBackground,
|
||||
hc: editorBackground
|
||||
}, nls.localize('editorPaneBackground', "Background color of the editor pane visible on the left and right side of the centered editor layout."));
|
||||
|
||||
registerColor('editorGroup.background', {
|
||||
dark: null,
|
||||
light: null,
|
||||
@@ -282,7 +312,13 @@ export const ACTIVITY_BAR_FOREGROUND = registerColor('activityBar.foreground', {
|
||||
dark: Color.white,
|
||||
light: Color.white,
|
||||
hc: Color.white
|
||||
}, nls.localize('activityBarForeground', "Activity bar foreground color (e.g. used for the icons). The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
|
||||
}, nls.localize('activityBarForeground', "Activity bar item foreground color when it is active. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
|
||||
|
||||
export const ACTIVITY_BAR_INACTIVE_FOREGROUND = registerColor('activityBar.inactiveForeground', {
|
||||
dark: transparent(ACTIVITY_BAR_FOREGROUND, 0.6),
|
||||
light: transparent(ACTIVITY_BAR_FOREGROUND, 0.6),
|
||||
hc: Color.white
|
||||
}, nls.localize('activityBarInActiveForeground', "Activity bar item foreground color when it is inactive. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
|
||||
|
||||
export const ACTIVITY_BAR_BORDER = registerColor('activityBar.border', {
|
||||
dark: null,
|
||||
@@ -290,7 +326,6 @@ export const ACTIVITY_BAR_BORDER = registerColor('activityBar.border', {
|
||||
hc: contrastBorder
|
||||
}, nls.localize('activityBarBorder', "Activity bar border color separating to the side bar. The activity bar is showing on the far left or right and allows to switch between views of the side bar."));
|
||||
|
||||
|
||||
export const ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND = registerColor('activityBar.dropBackground', {
|
||||
dark: Color.white.transparent(0.12),
|
||||
light: Color.white.transparent(0.12),
|
||||
@@ -354,6 +389,11 @@ export const SIDE_BAR_SECTION_HEADER_FOREGROUND = registerColor('sideBarSectionH
|
||||
hc: SIDE_BAR_FOREGROUND
|
||||
}, nls.localize('sideBarSectionHeaderForeground', "Side bar section header foreground color. The side bar is the container for views like explorer and search."));
|
||||
|
||||
export const SIDE_BAR_SECTION_HEADER_BORDER = registerColor('sideBarSectionHeader.border', {
|
||||
dark: contrastBorder,
|
||||
light: contrastBorder,
|
||||
hc: contrastBorder
|
||||
}, nls.localize('sideBarSectionHeaderBorder', "Side bar section header border color. The side bar is the container for views like explorer and search."));
|
||||
|
||||
|
||||
// < --- Title Bar --- >
|
||||
@@ -408,36 +448,6 @@ export const MENUBAR_SELECTION_BORDER = registerColor('menubar.selectionBorder',
|
||||
hc: activeContrastBorder
|
||||
}, nls.localize('menubarSelectionBorder', "Border color of the selected menu item in the menubar."));
|
||||
|
||||
export const MENU_FOREGROUND = registerColor('menu.foreground', {
|
||||
dark: SIDE_BAR_FOREGROUND,
|
||||
light: SIDE_BAR_FOREGROUND,
|
||||
hc: SIDE_BAR_FOREGROUND
|
||||
}, nls.localize('menuForeground', "Foreground color of menu items."));
|
||||
|
||||
export const MENU_BACKGROUND = registerColor('menu.background', {
|
||||
dark: SIDE_BAR_BACKGROUND,
|
||||
light: SIDE_BAR_BACKGROUND,
|
||||
hc: SIDE_BAR_BACKGROUND
|
||||
}, nls.localize('menuBackground', "Background color of menu items."));
|
||||
|
||||
export const MENU_SELECTION_FOREGROUND = registerColor('menu.selectionForeground', {
|
||||
dark: listActiveSelectionForeground,
|
||||
light: listActiveSelectionForeground,
|
||||
hc: listActiveSelectionForeground
|
||||
}, nls.localize('menuSelectionForeground', "Foreground color of the selected menu item in menus."));
|
||||
|
||||
export const MENU_SELECTION_BACKGROUND = registerColor('menu.selectionBackground', {
|
||||
dark: listActiveSelectionBackground,
|
||||
light: listActiveSelectionBackground,
|
||||
hc: listActiveSelectionBackground
|
||||
}, nls.localize('menuSelectionBackground', "Background color of the selected menu item in menus."));
|
||||
|
||||
export const MENU_SELECTION_BORDER = registerColor('menu.selectionBorder', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('menuSelectionBorder', "Border color of the selected menu item in menus."));
|
||||
|
||||
// < --- Notifications --- >
|
||||
|
||||
export const NOTIFICATIONS_CENTER_BORDER = registerColor('notificationCenter.border', {
|
||||
@@ -515,7 +525,7 @@ export class Themable extends Disposable {
|
||||
// Subclasses to override
|
||||
}
|
||||
|
||||
protected getColor(id: string, modify?: (color: Color, theme: ITheme) => Color): string {
|
||||
protected getColor(id: string, modify?: (color: Color, theme: ITheme) => Color): string | null {
|
||||
let color = this.theme.getColor(id);
|
||||
|
||||
if (color && modify) {
|
||||
|
||||
Reference in New Issue
Block a user