mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge VS Code 1.21 source code (#1067)
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
@@ -4,11 +4,24 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import nls = require('vs/nls');
|
||||
import { registerColor, editorBackground, contrastBorder, transparent, lighten, darken } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
|
||||
import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
|
||||
import { Color } from 'vs/base/common/color';
|
||||
|
||||
// < --- Workbench (not customizable) --- >
|
||||
|
||||
export function WORKBENCH_BACKGROUND(theme: ITheme): Color {
|
||||
switch (theme.type) {
|
||||
case 'dark':
|
||||
return Color.fromHex('#252526');
|
||||
case 'light':
|
||||
return Color.fromHex('#F3F3F3');
|
||||
default:
|
||||
return Color.fromHex('#000000');
|
||||
}
|
||||
}
|
||||
|
||||
// < --- Tabs --- >
|
||||
|
||||
export const TAB_ACTIVE_BACKGROUND = registerColor('tab.activeBackground', {
|
||||
@@ -23,6 +36,18 @@ export const TAB_INACTIVE_BACKGROUND = registerColor('tab.inactiveBackground', {
|
||||
hc: null
|
||||
}, nls.localize('tabInactiveBackground', "Inactive tab background color. 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_BACKGROUND = registerColor('tab.hoverBackground', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('tabHoverBackground', "Tab background color when hovering. 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_HOVER_BACKGROUND = registerColor('tab.unfocusedHoverBackground', {
|
||||
dark: transparent(TAB_HOVER_BACKGROUND, 0.5),
|
||||
light: transparent(TAB_HOVER_BACKGROUND, 0.7),
|
||||
hc: null
|
||||
}, nls.localize('tabUnfocusedHoverBackground', "Tab background color in an unfocused group when hovering. 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_BORDER = registerColor('tab.border', {
|
||||
dark: '#252526',
|
||||
light: '#F3F3F3',
|
||||
@@ -41,6 +66,18 @@ export const TAB_UNFOCUSED_ACTIVE_BORDER = registerColor('tab.unfocusedActiveBor
|
||||
hc: null
|
||||
}, nls.localize('tabActiveUnfocusedBorder', "Border to highlight 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_HOVER_BORDER = registerColor('tab.hoverBorder', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('tabHoverBorder', "Border to highlight tabs when hovering. 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_HOVER_BORDER = registerColor('tab.unfocusedHoverBorder', {
|
||||
dark: transparent(TAB_HOVER_BORDER, 0.5),
|
||||
light: transparent(TAB_HOVER_BORDER, 0.7),
|
||||
hc: null
|
||||
}, nls.localize('tabUnfocusedHoverBorder', "Border to highlight tabs in an unfocused group when hovering. 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_FOREGROUND = registerColor('tab.activeForeground', {
|
||||
dark: Color.white,
|
||||
light: '#333333',
|
||||
@@ -90,7 +127,7 @@ export const EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND = registerColor('editorGroup
|
||||
dark: editorBackground,
|
||||
light: editorBackground,
|
||||
hc: editorBackground
|
||||
}, nls.localize('editorGroupHeaderBackground', "Background color of the editor group title header when tabs are disabled. Editor groups are the containers of editors."));
|
||||
}, nls.localize('editorGroupHeaderBackground', "Background color of the editor group title header when tabs are disabled (`\"workbench.editor.showTabs\": false`). Editor groups are the containers of editors."));
|
||||
|
||||
export const EDITOR_GROUP_BORDER = registerColor('editorGroup.border', {
|
||||
dark: '#444444',
|
||||
@@ -199,13 +236,13 @@ export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarItem
|
||||
dark: '#388A34',
|
||||
light: '#388A34',
|
||||
hc: '#3883A4'
|
||||
}, nls.localize('statusBarProminentItemBackground', "Status bar prominent items background color. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
|
||||
}, nls.localize('statusBarProminentItemBackground', "Status bar prominent items background color. Prominent items stand out from other status bar entries to indicate importance. Change mode `Toggle Tab Key Moves Focus` from command palette to see an example. The status bar is shown in the bottom of the window."));
|
||||
|
||||
export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.prominentHoverBackground', {
|
||||
dark: '#369432',
|
||||
light: '#369432',
|
||||
hc: '#369432'
|
||||
}, nls.localize('statusBarProminentItemHoverBackground', "Status bar prominent items background color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
|
||||
}, nls.localize('statusBarProminentItemHoverBackground', "Status bar prominent items background color when hovering. Prominent items stand out from other status bar entries to indicate importance. Change mode `Toggle Tab Key Moves Focus` from command palette to see an example. The status bar is shown in the bottom of the window."));
|
||||
|
||||
|
||||
|
||||
@@ -329,71 +366,53 @@ export const TITLE_BAR_BORDER = registerColor('titleBar.border', {
|
||||
|
||||
// < --- Notifications --- >
|
||||
|
||||
export const NOTIFICATIONS_FOREGROUND = registerColor('notification.foreground', {
|
||||
dark: '#EEEEEE',
|
||||
light: '#EEEEEE',
|
||||
hc: '#FFFFFF'
|
||||
}, nls.localize('notificationsForeground', "Notifications foreground color. Notifications slide in from the top of the window."));
|
||||
|
||||
export const NOTIFICATIONS_BACKGROUND = registerColor('notification.background', {
|
||||
dark: '#333333',
|
||||
light: '#2C2C2C',
|
||||
hc: '#000000'
|
||||
}, nls.localize('notificationsBackground', "Notifications background color. Notifications slide in from the top of the window."));
|
||||
|
||||
export const NOTIFICATIONS_BUTTON_BACKGROUND = registerColor('notification.buttonBackground', {
|
||||
dark: '#0E639C',
|
||||
light: '#007ACC',
|
||||
hc: null
|
||||
}, nls.localize('notificationsButtonBackground', "Notifications button background color. Notifications slide in from the top of the window."));
|
||||
|
||||
export const NOTIFICATIONS_BUTTON_HOVER_BACKGROUND = registerColor('notification.buttonHoverBackground', {
|
||||
dark: lighten(NOTIFICATIONS_BUTTON_BACKGROUND, 0.2),
|
||||
light: darken(NOTIFICATIONS_BUTTON_BACKGROUND, 0.2),
|
||||
hc: null
|
||||
}, nls.localize('notificationsButtonHoverBackground', "Notifications button background color when hovering. Notifications slide in from the top of the window."));
|
||||
|
||||
export const NOTIFICATIONS_BUTTON_FOREGROUND = registerColor('notification.buttonForeground', {
|
||||
dark: Color.white,
|
||||
light: Color.white,
|
||||
hc: Color.white
|
||||
}, nls.localize('notificationsButtonForeground', "Notifications button foreground color. Notifications slide in from the top of the window."));
|
||||
|
||||
export const NOTIFICATIONS_INFO_BACKGROUND = registerColor('notification.infoBackground', {
|
||||
dark: '#007acc',
|
||||
light: '#007acc',
|
||||
export const NOTIFICATIONS_CENTER_BORDER = registerColor('notificationCenter.border', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: contrastBorder
|
||||
}, nls.localize('notificationsInfoBackground', "Notifications info background color. Notifications slide in from the top of the window."));
|
||||
}, nls.localize('notificationCenterBorder', "Notifications center border color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_INFO_FOREGROUND = registerColor('notification.infoForeground', {
|
||||
dark: NOTIFICATIONS_FOREGROUND,
|
||||
light: NOTIFICATIONS_FOREGROUND,
|
||||
hc: null
|
||||
}, nls.localize('notificationsInfoForeground', "Notifications info foreground color. Notifications slide in from the top of the window."));
|
||||
|
||||
export const NOTIFICATIONS_WARNING_BACKGROUND = registerColor('notification.warningBackground', {
|
||||
dark: '#B89500',
|
||||
light: '#B89500',
|
||||
export const NOTIFICATIONS_TOAST_BORDER = registerColor('notificationToast.border', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: contrastBorder
|
||||
}, nls.localize('notificationsWarningBackground', "Notifications warning background color. Notifications slide in from the top of the window."));
|
||||
}, nls.localize('notificationToastBorder', "Notification toast border color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_WARNING_FOREGROUND = registerColor('notification.warningForeground', {
|
||||
dark: NOTIFICATIONS_FOREGROUND,
|
||||
light: NOTIFICATIONS_FOREGROUND,
|
||||
export const NOTIFICATIONS_FOREGROUND = registerColor('notifications.foreground', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('notificationsWarningForeground', "Notifications warning foreground color. Notifications slide in from the top of the window."));
|
||||
}, nls.localize('notificationsForeground', "Notifications foreground color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_ERROR_BACKGROUND = registerColor('notification.errorBackground', {
|
||||
dark: '#BE1100',
|
||||
light: '#BE1100',
|
||||
hc: contrastBorder
|
||||
}, nls.localize('notificationsErrorBackground', "Notifications error background color. Notifications slide in from the top of the window."));
|
||||
export const NOTIFICATIONS_BACKGROUND = registerColor('notifications.background', {
|
||||
dark: editorWidgetBackground,
|
||||
light: editorWidgetBackground,
|
||||
hc: editorWidgetBackground
|
||||
}, nls.localize('notificationsBackground', "Notifications background color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_ERROR_FOREGROUND = registerColor('notification.errorForeground', {
|
||||
dark: NOTIFICATIONS_FOREGROUND,
|
||||
light: NOTIFICATIONS_FOREGROUND,
|
||||
export const NOTIFICATIONS_LINKS = registerColor('notificationLink.foreground', {
|
||||
dark: textLinkForeground,
|
||||
light: textLinkForeground,
|
||||
hc: textLinkForeground
|
||||
}, nls.localize('notificationsLink', "Notification links foreground color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_CENTER_HEADER_FOREGROUND = registerColor('notificationCenterHeader.foreground', {
|
||||
dark: null,
|
||||
light: null,
|
||||
hc: null
|
||||
}, nls.localize('notificationsErrorForeground', "Notifications error foreground color. Notifications slide in from the top of the window."));
|
||||
}, nls.localize('notificationCenterHeaderForeground', "Notifications center header foreground color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_CENTER_HEADER_BACKGROUND = registerColor('notificationCenterHeader.background', {
|
||||
dark: lighten(NOTIFICATIONS_BACKGROUND, 0.3),
|
||||
light: darken(NOTIFICATIONS_BACKGROUND, 0.05),
|
||||
hc: NOTIFICATIONS_BACKGROUND
|
||||
}, nls.localize('notificationCenterHeaderBackground', "Notifications center header background color. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
export const NOTIFICATIONS_BORDER = registerColor('notifications.border', {
|
||||
dark: NOTIFICATIONS_CENTER_HEADER_BACKGROUND,
|
||||
light: NOTIFICATIONS_CENTER_HEADER_BACKGROUND,
|
||||
hc: NOTIFICATIONS_CENTER_HEADER_BACKGROUND
|
||||
}, nls.localize('notificationsBorder', "Notifications border color separating from other notifications in the notifications center. Notifications slide in from the bottom right of the window."));
|
||||
|
||||
/**
|
||||
* Base class for all themable workbench components.
|
||||
@@ -443,4 +462,4 @@ export class Themable extends Disposable {
|
||||
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user