From 718bc0d7373d7dd162d0d4e40903c9c84d643820 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Thu, 6 Jul 2023 13:49:14 -0700 Subject: [PATCH] restore default theme (#23672) --- .../services/themes/common/themeConfiguration.ts | 14 ++------------ .../themes/common/workbenchThemeService.ts | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts index 6edee9f810..15d11473d5 100644 --- a/src/vs/workbench/services/themes/common/themeConfiguration.ts +++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts @@ -14,17 +14,7 @@ import { workbenchColorsSchemaId } from 'vs/platform/theme/common/colorRegistry' import { tokenStylingSchemaId } from 'vs/platform/theme/common/tokenClassificationRegistry'; import { ThemeSettings, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IColorCustomizations, ITokenColorCustomizations, IWorkbenchProductIconTheme, ISemanticTokenColorCustomizations, ThemeSettingTarget, ThemeSettingDefaults } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -import { isWeb } from 'vs/base/common/platform'; - -// {{SQL CARBON TODO}} - set default themes -// const DEFAULT_THEME_DARK_SETTING_VALUE = 'Default Dark Azure Data Studio'; // {{SQL CARBON EDIT}} replace default theme -// const DEFAULT_THEME_LIGHT_SETTING_VALUE = 'Default Light Azure Data Studio'; // {{SQL CARBON EDIT}} replace default theme -// const DEFAULT_THEME_HC_DARK_SETTING_VALUE = 'Default High Contrast'; -// const DEFAULT_THEME_HC_LIGHT_SETTING_VALUE = 'Default High Contrast Light'; - -// const DEFAULT_FILE_ICON_THEME_SETTING_VALUE = 'vs-seti'; - -export const DEFAULT_PRODUCT_ICON_THEME_SETTING_VALUE = 'Default'; +// import { isWeb } from 'vs/base/common/platform'; // {{SQL CARBON EDIT}} - remove import since it is not needed. // Configuration: Themes const configurationRegistry = Registry.as(ConfigurationExtensions.Configuration); @@ -40,7 +30,7 @@ function formatSettingAsLink(str: string) { const colorThemeSettingSchema: IConfigurationPropertySchema = { type: 'string', description: nls.localize('colorTheme', "Specifies the color theme used in the workbench."), - default: isWeb ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK, + default: ThemeSettingDefaults.COLOR_THEME_LIGHT, // {{SQL CARBON EDIT}} - use light theme as default. enum: colorThemeSettingEnum, enumDescriptions: colorThemeSettingEnumDescriptions, enumItemLabels: colorThemeSettingEnumItemLabels, diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts index 1789a220e9..26890ac2e2 100644 --- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts @@ -41,8 +41,8 @@ export enum ThemeSettings { } export enum ThemeSettingDefaults { - COLOR_THEME_DARK = 'Default Dark Modern', - COLOR_THEME_LIGHT = 'Default Light Modern', + COLOR_THEME_DARK = 'Default Dark Azure Data Studio', // {{SQL CARBON EDIT}} - use ADS default themes. + COLOR_THEME_LIGHT = 'Default Light Azure Data Studio', // {{SQL CARBON EDIT}} - use ADS default themes. COLOR_THEME_HC_DARK = 'Default High Contrast', COLOR_THEME_HC_LIGHT = 'Default High Contrast Light',