From 9b6f7c066546a4c7f104368fc769fb3768b08bfd Mon Sep 17 00:00:00 2001 From: Brian Lambert Date: Fri, 20 Sep 2024 16:22:30 -0700 Subject: [PATCH] UI/theme updates (#4762) --- extensions/theme-defaults/package.json | 12 ++ extensions/theme-defaults/package.nls.json | 8 +- .../theme-defaults/themes/dark_modern.json | 193 ++++++++--------- .../theme-defaults/themes/light_modern.json | 198 +++++++++--------- .../theme-defaults/themes/positron_dark.json | 34 +++ .../theme-defaults/themes/positron_light.json | 34 +++ src/vs/workbench/common/theme.ts | 44 ++-- .../themes/browser/workbenchThemeService.ts | 2 + .../themes/common/workbenchThemeService.ts | 6 +- 9 files changed, 303 insertions(+), 228 deletions(-) create mode 100644 extensions/theme-defaults/themes/positron_dark.json create mode 100644 extensions/theme-defaults/themes/positron_light.json diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json index 2458ef317da..642897f313e 100644 --- a/extensions/theme-defaults/package.json +++ b/extensions/theme-defaults/package.json @@ -25,6 +25,12 @@ "uiTheme": "vs-dark", "path": "./themes/dark_modern.json" }, + { + "id": "Default Positron Dark", + "label": "%positronDarkThemeLabel%", + "uiTheme": "vs-dark", + "path": "./themes/positron_dark.json" + }, { "id": "Default Light+", "label": "%lightPlusColorThemeLabel%", @@ -37,6 +43,12 @@ "uiTheme": "vs", "path": "./themes/light_modern.json" }, + { + "id": "Default Positron Light", + "label": "%positronLightThemeLabel%", + "uiTheme": "vs", + "path": "./themes/positron_light.json" + }, { "id": "Visual Studio Dark", "label": "%darkColorThemeLabel%", diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json index 1f366352c6d..ae363fcf660 100644 --- a/extensions/theme-defaults/package.nls.json +++ b/extensions/theme-defaults/package.nls.json @@ -2,12 +2,14 @@ "displayName": "Default Themes", "description": "The default Visual Studio light and dark themes", "darkPlusColorThemeLabel": "Dark+", - "darkModernThemeLabel": "Positron Dark", + "darkModernThemeLabel": "Dark Modern", "lightPlusColorThemeLabel": "Light+", - "lightModernThemeLabel": "Positron Light", + "lightModernThemeLabel": "Light Modern", "darkColorThemeLabel": "Dark (Visual Studio)", "lightColorThemeLabel": "Light (Visual Studio)", "hcColorThemeLabel": "Dark High Contrast", "lightHcColorThemeLabel": "Light High Contrast", - "minimalIconThemeLabel": "Minimal (Visual Studio Code)" + "minimalIconThemeLabel": "Minimal (Visual Studio Code)", + "positronDarkThemeLabel": "Positron Dark", + "positronLightThemeLabel": "Positron Light" } diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json index fcdb79673b8..57578ca9692 100644 --- a/extensions/theme-defaults/themes/dark_modern.json +++ b/extensions/theme-defaults/themes/dark_modern.json @@ -3,23 +3,22 @@ "name": "Default Dark Modern", "include": "./dark_plus.json", "colors": { - "activityBar.activeBackground": "#ffffff00", - "activityBar.activeBorder": "#c1d6e8", - "activityBar.background": "#32485b", - "activityBar.border": "#ffffff00", - "activityBar.foreground": "#c1d6e8", - "activityBar.inactiveForeground": "#acbece", - "activityBarBadge.background": "#ce0101", - "activityBarBadge.foreground": "#ffffff", - "badge.background": "#32485b", - "badge.foreground": "#ffffff", - "button.background": "#32485b", - "button.border": "#ffffff12", - "button.foreground": "#ffffff", - "button.hoverBackground": "#32485be6", - "button.secondaryBackground": "#FFFFFF0F", - "button.secondaryForeground": "#cccccc", - "button.secondaryHoverBackground": "#ffffff15", + "activityBar.activeBorder": "#0078D4", + "activityBar.background": "#181818", + "activityBar.border": "#2B2B2B", + "activityBar.foreground": "#D7D7D7", + "activityBar.inactiveForeground": "#868686", + "activityBarBadge.background": "#0078D4", + "activityBarBadge.foreground": "#FFFFFF", + "badge.background": "#616161", + "badge.foreground": "#F8F8F8", + "button.background": "#0078D4", + "button.border": "#FFFFFF12", + "button.foreground": "#FFFFFF", + "button.hoverBackground": "#026EC1", + "button.secondaryBackground": "#313131", + "button.secondaryForeground": "#CCCCCC", + "button.secondaryHoverBackground": "#3C3C3C", "chat.slashCommandBackground": "#34414B", "chat.slashCommandForeground": "#40A6FF", "checkbox.background": "#313131", @@ -35,57 +34,46 @@ "editor.foreground": "#CCCCCC", "editorGroup.border": "#FFFFFF17", "editorGroupHeader.tabsBackground": "#181818", - "editorGroupHeader.tabsBorder": "#ffffff15", - "editorGutter.addedBackground": "#2ea043", - "editorGutter.deletedBackground": "#f85149", - "editorGutter.modifiedBackground": "#32485b", - "editorInlayHint.background": "#8b949e33", - "editorInlayHint.foreground": "#8b949e", - "editorInlayHint.typeBackground": "#8b949e33", - "editorInlayHint.typeForeground": "#8b949e", - "editorLineNumber.activeForeground": "#cccccc", - "editorLineNumber.foreground": "#6e7681", + "editorGroupHeader.tabsBorder": "#2B2B2B", + "editorGutter.addedBackground": "#2EA043", + "editorGutter.deletedBackground": "#F85149", + "editorGutter.modifiedBackground": "#0078D4", + "editorLineNumber.activeForeground": "#CCCCCC", + "editorLineNumber.foreground": "#6E7681", "editorOverviewRuler.border": "#010409", - "editorWidget.background": "#1f1f1f", - "errorForeground": "#f85149", - "focusBorder": "#32485b", - "foreground": "#cccccc", - "icon.foreground": "#cccccc", - "input.background": "#2a2a2a", - "input.border": "#ffffff1f", - "input.foreground": "#cccccc", - "input.placeholderForeground": "#ffffff79", - "inputOption.activeBackground": "#2489db82", - "inputOption.activeBorder": "#2488db", - "keybindingLabel.foreground": "#cccccc", - "list.activeSelectionBackground": "#32485b", - "list.activeSelectionIconForeground": "#ffffff", - "list.activeSelectionForeground": "#ffffff", - "menu.background": "#1f1f1f", - "notificationCenterHeader.background": "#1f1f1f", - "notificationCenterHeader.foreground": "#cccccc", - "notifications.background": "#1f1f1f", - "notifications.border": "#ffffff15", - "notifications.foreground": "#cccccc", + "editorWidget.background": "#202020", + "errorForeground": "#F85149", + "focusBorder": "#0078D4", + "foreground": "#CCCCCC", + "icon.foreground": "#CCCCCC", + "input.background": "#313131", + "input.border": "#3C3C3C", + "input.foreground": "#CCCCCC", + "input.placeholderForeground": "#989898", + "inputOption.activeBackground": "#2489DB82", + "inputOption.activeBorder": "#2488DB", + "keybindingLabel.foreground": "#CCCCCC", + "menu.background": "#1F1F1F", + "menu.selectionBackground": "#0078d4", + "notificationCenterHeader.background": "#1F1F1F", + "notificationCenterHeader.foreground": "#CCCCCC", + "notifications.background": "#1F1F1F", + "notifications.border": "#2B2B2B", + "notifications.foreground": "#CCCCCC", "panel.background": "#181818", - "panel.border": "#ffffff15", - "panelInput.border": "#ffffff15", - "panelTitle.activeBorder": "#32485b", - "panelTitle.activeForeground": "#cccccc", - "panelTitle.inactiveForeground": "#8b949e", - "peekViewEditor.background": "#1f1f1f", - "peekViewEditor.matchHighlightBackground": "#bb800966", - "peekViewResult.background": "#1f1f1f", - "peekViewResult.matchHighlightBackground": "#bb800966", - "pickerGroup.border": "#ffffff15", - "pickerGroup.foreground": "#8b949e", - "progressBar.background": "#32485b", - "quickInput.background": "#1f1f1f", - "quickInput.foreground": "#cccccc", - "scrollbar.shadow": "#484f5833", - "scrollbarSlider.activeBackground": "#6e768187", - "scrollbarSlider.background": "#6e768133", - "scrollbarSlider.hoverBackground": "#6e768145", + "panel.border": "#2B2B2B", + "panelInput.border": "#2B2B2B", + "panelTitle.activeBorder": "#0078D4", + "panelTitle.activeForeground": "#CCCCCC", + "panelTitle.inactiveForeground": "#9D9D9D", + "peekViewEditor.background": "#1F1F1F", + "peekViewEditor.matchHighlightBackground": "#BB800966", + "peekViewResult.background": "#1F1F1F", + "peekViewResult.matchHighlightBackground": "#BB800966", + "pickerGroup.border": "#3C3C3C", + "progressBar.background": "#0078D4", + "quickInput.background": "#222222", + "quickInput.foreground": "#CCCCCC", "settings.dropdownBackground": "#313131", "settings.dropdownBorder": "#3C3C3C", "settings.headerForeground": "#FFFFFF", @@ -98,44 +86,45 @@ "sideBarSectionHeader.foreground": "#CCCCCC", "sideBarTitle.foreground": "#CCCCCC", "statusBar.background": "#181818", - "statusBar.border": "#ffffff15", - "statusBar.debuggingBackground": "#32485b", - "statusBar.debuggingForeground": "#ffffff", - "statusBar.focusBorder": "#32485b", - "statusBar.foreground": "#cccccc", - "statusBar.noFolderBackground": "#1f1f1f", - "statusBarItem.focusBorder": "#32485b", - "statusBarItem.prominentBackground": "#6e768166", - "statusBarItem.remoteBackground": "#32485b", - "statusBarItem.remoteForeground": "#ffffff", - "tab.activeBackground": "#1f1f1f", - "tab.activeBorder": "#1f1f1f", - "tab.activeBorderTop": "#32485b", - "tab.activeForeground": "#ffffff", - "tab.border": "#ffffff15", - "tab.hoverBackground": "#1f1f1f", + "statusBar.border": "#2B2B2B", + "statusBar.debuggingBackground": "#0078D4", + "statusBar.debuggingForeground": "#FFFFFF", + "statusBar.focusBorder": "#0078D4", + "statusBar.foreground": "#CCCCCC", + "statusBar.noFolderBackground": "#1F1F1F", + "statusBarItem.focusBorder": "#0078D4", + "statusBarItem.prominentBackground": "#6E768166", + "statusBarItem.remoteBackground": "#0078D4", + "statusBarItem.remoteForeground": "#FFFFFF", + "tab.activeBackground": "#1F1F1F", + "tab.activeBorder": "#1F1F1F", + "tab.activeBorderTop": "#0078D4", + "tab.activeForeground": "#FFFFFF", + "tab.selectedBorderTop": "#6caddf", + "tab.border": "#2B2B2B", + "tab.hoverBackground": "#1F1F1F", "tab.inactiveBackground": "#181818", - "tab.inactiveForeground": "#ffffff80", - "tab.unfocusedActiveBorder": "#1f1f1f", - "tab.unfocusedActiveBorderTop": "#ffffff15", - "tab.unfocusedHoverBackground": "#6e76811a", - "terminal.foreground": "#cccccc", - "terminal.tab.activeBorder": "#32485b", - "textBlockQuote.background": "#010409", - "textBlockQuote.border": "#ffffff14", - "textCodeBlock.background": "#6e768166", - "textLink.activeForeground": "#8cc9ff", - "textLink.foreground": "#8cc9ff", - "textPreformat.foreground": "#D7BA7D", + "tab.inactiveForeground": "#9D9D9D", + "tab.unfocusedActiveBorder": "#1F1F1F", + "tab.unfocusedActiveBorderTop": "#2B2B2B", + "tab.unfocusedHoverBackground": "#1F1F1F", + "terminal.foreground": "#CCCCCC", + "terminal.tab.activeBorder": "#0078D4", + "textBlockQuote.background": "#2B2B2B", + "textBlockQuote.border": "#616161", + "textCodeBlock.background": "#2B2B2B", + "textLink.activeForeground": "#4daafc", + "textLink.foreground": "#4daafc", + "textPreformat.foreground": "#D0D0D0", "textPreformat.background": "#3C3C3C", - "textSeparator.foreground": "#21262d", + "textSeparator.foreground": "#21262D", "titleBar.activeBackground": "#181818", - "titleBar.activeForeground": "#cccccc", - "titleBar.border": "#ffffff15", - "titleBar.inactiveBackground": "#1f1f1f", - "titleBar.inactiveForeground": "#8b949e", - "welcomePage.tileBackground": "#ffffff0f", - "welcomePage.progress.foreground": "#32485b", - "widget.border": "#ffffff15", + "titleBar.activeForeground": "#CCCCCC", + "titleBar.border": "#2B2B2B", + "titleBar.inactiveBackground": "#1F1F1F", + "titleBar.inactiveForeground": "#9D9D9D", + "welcomePage.tileBackground": "#2B2B2B", + "welcomePage.progress.foreground": "#0078D4", + "widget.border": "#313131", }, } diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json index 2d493f2b26a..bd7e647afb3 100644 --- a/extensions/theme-defaults/themes/light_modern.json +++ b/extensions/theme-defaults/themes/light_modern.json @@ -3,26 +3,25 @@ "name": "Default Light Modern", "include": "./light_plus.json", "colors": { - "activityBar.activeBackground": "#ffffff00", - "activityBar.activeBorder": "#ffffff", - "activityBar.background": "#3a78b1", - "activityBar.border": "#ffffff00", - "activityBar.foreground": "#ffffff", - "activityBar.inactiveForeground": "#ffffffaa", - "activityBarBadge.background": "#ce0101", - "activityBarBadge.foreground": "#ffffff", - "badge.background": "#3a78b1", - "badge.foreground": "#ffffff", - "button.background": "#3a78b1", + "activityBar.activeBorder": "#005FB8", + "activityBar.background": "#F8F8F8", + "activityBar.border": "#E5E5E5", + "activityBar.foreground": "#1F1F1F", + "activityBar.inactiveForeground": "#616161", + "activityBarBadge.background": "#005FB8", + "activityBarBadge.foreground": "#FFFFFF", + "badge.background": "#CCCCCC", + "badge.foreground": "#3B3B3B", + "button.background": "#005FB8", "button.border": "#0000001a", - "button.foreground": "#ffffff", - "button.hoverBackground": "#3a78b1e6", - "button.secondaryBackground": "#0000001a", - "button.secondaryForeground": "#3b3b3b", - "button.secondaryHoverBackground": "#00000034", + "button.foreground": "#FFFFFF", + "button.hoverBackground": "#0258A8", + "button.secondaryBackground": "#E5E5E5", + "button.secondaryForeground": "#3B3B3B", + "button.secondaryHoverBackground": "#CCCCCC", "chat.slashCommandBackground": "#D2ECFF", "chat.slashCommandForeground": "#306CA2", - "checkbox.background": "#f8f8f8", + "checkbox.background": "#F8F8F8", "checkbox.border": "#CECECE", "descriptionForeground": "#3B3B3B", "dropdown.background": "#FFFFFF", @@ -33,62 +32,60 @@ "editor.foreground": "#3B3B3B", "editor.inactiveSelectionBackground": "#E5EBF1", "editor.selectionHighlightBackground": "#ADD6FF80", - "editorGroup.border": "#0000001a", - "editorGroupHeader.tabsBackground": "#f8f8f8", - "editorGroupHeader.tabsBorder": "#0000001a", - "editorGutter.addedBackground": "#2ea043", - "editorGutter.deletedBackground": "#f85149", - "editorGutter.modifiedBackground": "#3a78b1", - "editorIndentGuide.background": "#D3D3D3", + "editorGroup.border": "#E5E5E5", + "editorGroupHeader.tabsBackground": "#F8F8F8", + "editorGroupHeader.tabsBorder": "#E5E5E5", + "editorGutter.addedBackground": "#2EA043", + "editorGutter.deletedBackground": "#F85149", + "editorGutter.modifiedBackground": "#005FB8", + "editorIndentGuide.background1": "#D3D3D3", "editorLineNumber.activeForeground": "#171184", - "editorLineNumber.foreground": "#6e7681", - "editorOverviewRuler.border": "#0000001a", - "editorSuggestWidget.background": "#f8f8f8", - "editorWidget.background": "#ffffff", - "errorForeground": "#f85149", - "focusBorder": "#3a78b1", - "foreground": "#3b3b3b", - "icon.foreground": "#3b3b3b", - "input.background": "#ffffff", + "editorLineNumber.foreground": "#6E7681", + "editorOverviewRuler.border": "#E5E5E5", + "editorSuggestWidget.background": "#F8F8F8", + "editorWidget.background": "#F8F8F8", + "errorForeground": "#F85149", + "focusBorder": "#005FB8", + "foreground": "#3B3B3B", + "icon.foreground": "#3B3B3B", + "input.background": "#FFFFFF", "input.border": "#CECECE", "input.foreground": "#3B3B3B", "input.placeholderForeground": "#767676", "inputOption.activeBackground": "#BED6ED", "inputOption.activeBorder": "#005FB8", "inputOption.activeForeground": "#000000", - "keybindingLabel.foreground": "#3b3b3b", - "list.activeSelectionBackground": "#bad2e8", + "keybindingLabel.foreground": "#3B3B3B", + "list.activeSelectionBackground": "#E8E8E8", "list.activeSelectionForeground": "#000000", "list.activeSelectionIconForeground": "#000000", - "list.inactiveSelectionBackground": "#bad2e87f", - "list.hoverBackground": "#f2f2f2", - "menu.border": "#D4D4D4", - "notebook.cellBorderColor": "#E8E8E8", - "notebook.selectedCellBackground": "#c8ddf150", - "notificationCenterHeader.background": "#ffffff", - "notificationCenterHeader.foreground": "#3b3b3b", - "notifications.background": "#ffffff", - "notifications.border": "#0000001a", - "notifications.foreground": "#3b3b3b", - "panel.background": "#ffffff", - "panel.border": "#0000001a", - "panelInput.border": "#0000001a", - "panelTitle.activeBorder": "#3a78b1", - "panelTitle.activeForeground": "#3b3b3b", - "panelTitle.inactiveForeground": "#3b3b3b", - "peekViewEditor.matchHighlightBackground": "#bb800966", - "peekViewResult.background": "#ffffff", - "peekViewResult.matchHighlightBackground": "#bb800966", - "pickerGroup.border": "#0000001a", - "pickerGroup.foreground": "#8b949e", + "list.hoverBackground": "#F2F2F2", + "list.focusAndSelectionOutline": "#005FB8", + "menu.border": "#CECECE", + "menu.selectionBackground": "#005FB8", + "menu.selectionForeground": "#ffffff", + "notebook.cellBorderColor": "#E5E5E5", + "notebook.selectedCellBackground": "#C8DDF150", + "notificationCenterHeader.background": "#FFFFFF", + "notificationCenterHeader.foreground": "#3B3B3B", + "notifications.background": "#FFFFFF", + "notifications.border": "#E5E5E5", + "notifications.foreground": "#3B3B3B", + "panel.background": "#F8F8F8", + "panel.border": "#E5E5E5", + "panelInput.border": "#E5E5E5", + "panelTitle.activeBorder": "#005FB8", + "panelTitle.activeForeground": "#3B3B3B", + "panelTitle.inactiveForeground": "#3B3B3B", + "peekViewEditor.matchHighlightBackground": "#BB800966", + "peekViewResult.background": "#FFFFFF", + "peekViewResult.matchHighlightBackground": "#BB800966", + "pickerGroup.border": "#E5E5E5", + "pickerGroup.foreground": "#8B949E", "ports.iconRunningProcessForeground": "#369432", - "progressBar.background": "#3a78b1", - "quickInput.background": "#ffffff", - "quickInput.foreground": "#3b3b3b", - "scrollbar.shadow": "#484f5833", - "scrollbarSlider.activeBackground": "#6e768187", - "scrollbarSlider.background": "#6e768133", - "scrollbarSlider.hoverBackground": "#6e768145", + "progressBar.background": "#005FB8", + "quickInput.background": "#F8F8F8", + "quickInput.foreground": "#3B3B3B", "searchEditor.textInputBorder": "#CECECE", "settings.dropdownBackground": "#FFFFFF", "settings.dropdownBorder": "#CECECE", @@ -108,41 +105,44 @@ "statusBar.border": "#E5E5E5", "statusBar.debuggingBackground": "#FD716C", "statusBar.debuggingForeground": "#000000", - "statusBar.focusBorder": "#3a78b1", - "statusBar.noFolderBackground": "#f8f8f8", - "statusBarItem.errorBackground": "#c72e0f", - "statusBarItem.focusBorder": "#3a78b1", - "statusBarItem.prominentBackground": "#6e768166", - "statusBarItem.remoteBackground": "#3a78b1", - "statusBarItem.remoteForeground": "#ffffff", - "tab.activeBackground": "#ffffff", - "tab.activeBorder": "#f8f8f8", - "tab.activeBorderTop": "#3a78b1", - "tab.activeForeground": "#3b3b3b", - "tab.border": "#0000001a", - "tab.hoverBackground": "#ffffff", - "tab.inactiveBackground": "#f8f8f8", - "tab.inactiveForeground": "#00000080", - "tab.lastPinnedBorder": "#3b3b3b30", - "tab.unfocusedActiveBorder": "#f8f8f8", - "tab.unfocusedActiveBorderTop": "#00000015", - "tab.unfocusedHoverBackground": "#6e76811a", - "terminalCursor.foreground": "#3a78b1", - "terminal.background": "#ffffff", - "terminal.foreground": "#3b3b3b", - "terminal.tab.activeBorder": "#3a78b1", - "textBlockQuote.background": "#f8f8f8", - "textBlockQuote.border": "#0000001a", - "textCodeBlock.background": "#f2f2f2", - "textLink.activeForeground": "#3a78b1", - "textLink.foreground": "#3a78b1", - "textSeparator.foreground": "#21262d", - "titleBar.activeBackground": "#f8f8f8", - "titleBar.activeForeground": "#1e1e1e", - "titleBar.border": "#0000001a", - "titleBar.inactiveBackground": "#f8f8f8", - "titleBar.inactiveForeground": "#8b949e", - "welcomePage.tileBackground": "#f3f3f3", - "widget.border": "#0000001a" + "statusBar.focusBorder": "#005FB8", + "statusBar.noFolderBackground": "#F8F8F8", + "statusBarItem.errorBackground": "#C72E0F", + "statusBarItem.focusBorder": "#005FB8", + "statusBarItem.prominentBackground": "#6E768166", + "statusBarItem.remoteBackground": "#005FB8", + "statusBarItem.remoteForeground": "#FFFFFF", + "tab.activeBackground": "#FFFFFF", + "tab.activeBorder": "#F8F8F8", + "tab.activeBorderTop": "#005FB8", + "tab.activeForeground": "#3B3B3B", + "tab.selectedBorderTop": "#68a3da", + "tab.border": "#E5E5E5", + "tab.hoverBackground": "#FFFFFF", + "tab.inactiveBackground": "#F8F8F8", + "tab.inactiveForeground": "#868686", + "tab.lastPinnedBorder": "#D4D4D4", + "tab.unfocusedActiveBorder": "#F8F8F8", + "tab.unfocusedActiveBorderTop": "#E5E5E5", + "tab.unfocusedHoverBackground": "#F8F8F8", + "terminalCursor.foreground": "#005FB8", + "terminal.foreground": "#3B3B3B", + "terminal.inactiveSelectionBackground": "#E5EBF1", + "terminal.tab.activeBorder": "#005FB8", + "textBlockQuote.background": "#F8F8F8", + "textBlockQuote.border": "#E5E5E5", + "textCodeBlock.background": "#F8F8F8", + "textLink.activeForeground": "#005FB8", + "textLink.foreground": "#005FB8", + "textPreformat.foreground": "#3B3B3B", + "textPreformat.background": "#0000001F", + "textSeparator.foreground": "#21262D", + "titleBar.activeBackground": "#F8F8F8", + "titleBar.activeForeground": "#1E1E1E", + "titleBar.border": "#E5E5E5", + "titleBar.inactiveBackground": "#F8F8F8", + "titleBar.inactiveForeground": "#8B949E", + "welcomePage.tileBackground": "#F3F3F3", + "widget.border": "#E5E5E5" }, } diff --git a/extensions/theme-defaults/themes/positron_dark.json b/extensions/theme-defaults/themes/positron_dark.json new file mode 100644 index 00000000000..0f5225425f9 --- /dev/null +++ b/extensions/theme-defaults/themes/positron_dark.json @@ -0,0 +1,34 @@ +{ + "$schema": "vscode://schemas/color-theme", + "name": "Default Positron Dark", + "include": "./dark_modern.json", + "colors": { + "activityBar.activeBorder": "#C1D6E8", + "activityBar.background": "#32485B", + "activityBar.border": "#FFFFFF00", + "activityBar.foreground": "#C1D6E8", + "activityBar.inactiveForeground": "#ACBECE", + "activityBarBadge.background": "#CE0101", + "badge.background": "#32485B", + "badge.foreground": "#FFFFFF", + "button.background": "#32485B", + "button.border": "#32485B", + "button.hoverBackground": "#32485BE6", + "editorGutter.modifiedBackground": "#32485B", + "focusBorder": "#32485B", + "menu.selectionBackground": "#32485B", + "panel.background": "#181818", + "panelTitle.activeBorder": "#32485B", + "progressBar.background": "#32485B", + "statusBar.debuggingBackground": "#32485B", + "statusBar.focusBorder": "#32485B", + "statusBarItem.focusBorder": "#32485B", + "statusBarItem.remoteBackground": "#32485B", + "tab.activeBorderTop": "#32485B", + "terminalCursor.foreground": "#32485B", + "terminal.tab.activeBorder": "#32485B", + "textLink.activeForeground": "#32485B", + "textLink.foreground": "#32485B", + "welcomePage.progress.foreground": "#32485B", + }, +} diff --git a/extensions/theme-defaults/themes/positron_light.json b/extensions/theme-defaults/themes/positron_light.json new file mode 100644 index 00000000000..a750b255a6c --- /dev/null +++ b/extensions/theme-defaults/themes/positron_light.json @@ -0,0 +1,34 @@ +{ + "$schema": "vscode://schemas/color-theme", + "name": "Default Positron Light", + "include": "./light_modern.json", + "colors": { + "activityBar.activeBorder": "#FFFFFF", + "activityBar.background": "#3A78B1", + "activityBar.border": "#FFFFFF00", + "activityBar.foreground": "#FFFFFF", + "activityBar.inactiveForeground": "#FFFFFFAA", + "activityBarBadge.background": "#CE0101", + "badge.background": "#3A78B1", + "badge.foreground": "#FFFFFF", + "button.background": "#3A78B1", + "button.border": "#0000001A", + "button.hoverBackground": "#3A78B1E6", + "editorGutter.modifiedBackground": "#3A78B1", + "focusBorder": "#3A78B1", + "menu.selectionBackground": "#3A78B1", + "panel.background": "#FFFFFF", + "panelTitle.activeBorder": "#3A78B1", + "progressBar.background": "#3A78B1", + "statusBar.debuggingBackground": "#3A78B1", + "statusBar.focusBorder": "#3A78B1", + "statusBarItem.focusBorder": "#3A78B1", + "statusBarItem.remoteBackground": "#3A78B1", + "tab.activeBorderTop": "#3A78B1", + "terminalCursor.foreground": "#3A78B1", + "terminal.tab.activeBorder": "#3A78B1", + "textLink.activeForeground": "#3A78B1", + "textLink.foreground": "#3A78B1", + "welcomePage.progress.foreground": "#3A78B1", + }, +} diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index 2d051bdafec..6e80b9f834e 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.ts @@ -1090,10 +1090,10 @@ export const POSITRON_SIDE_ACTION_BAR_BORDER = registerColor('positronSideAction // Positron side action bar background color. export const POSITRON_SIDE_ACTION_BAR_BACKGROUND = registerColor('positronSideActionBar.background', { - dark: 'terminal.background', - light: 'terminal.background', - hcDark: 'terminal.background', - hcLight: 'terminal.background' + dark: 'panel.background', + light: 'panel.background', + hcDark: 'panel.background', + hcLight: 'panel.background' }, localize('positronSideActionBar.background', "Positron side action bar background color.")); // Positron side action bar foreground color. @@ -1558,10 +1558,10 @@ export const POSITRON_DROP_DOWN_SEPARATOR_BACKGROUND = registerColor('positronDr // Positron console background color. export const POSITRON_CONSOLE_BACKGROUND_COLOR = registerColor('positronConsole.background', { - dark: 'terminal.background', - light: 'terminal.background', - hcDark: 'terminal.background', - hcLight: 'terminal.background' + dark: 'panel.background', + light: 'panel.background', + hcDark: 'panel.background', + hcLight: 'panel.background' }, localize('positronConsole.background', "Positron console background color.")); // Positron console foreground color. @@ -1576,8 +1576,8 @@ export const POSITRON_CONSOLE_FOREGROUND_COLOR = registerColor('positronConsole. export const POSITRON_CONSOLE_ERROR_BACKGROUND_COLOR = registerColor('positronConsole.errorBackground', { dark: transparent('terminal.ansiRed', 0.1), light: transparent('terminal.ansiRed', 0.05), - hcDark: 'terminal.background', - hcLight: 'terminal.background' + hcDark: 'panel.background', + hcLight: 'panel.background' }, localize('positronConsole.errorBackground', "Positron console error background color.")); // Positron console error foreground color. @@ -1916,10 +1916,10 @@ export const POSITRON_DATA_EXPLORER_SPARKLINE_STROKE_COLOR = registerColor('posi // Positron variables background color. export const POSITRON_VARIABLES_BACKGROUND_COLOR = registerColor('positronVariables.background', { - dark: 'terminal.background', - light: 'terminal.background', - hcDark: 'terminal.background', - hcLight: 'terminal.background' + dark: 'panel.background', + light: 'panel.background', + hcDark: 'panel.background', + hcLight: 'panel.background' }, localize('positronVariables.background', "Positron variables background color.")); // Positron variables foreground color. @@ -1998,10 +1998,10 @@ export const POSITRON_VARIABLES_INACTIVE_SELECTION_FOREGROUND_COLOR = registerCo // Positron plots background color. export const POSITRON_PLOTS_BACKGROUND_COLOR = registerColor('positronPlots.background', { - dark: 'terminal.background', - light: 'terminal.background', - hcDark: 'terminal.background', - hcLight: 'terminal.background' + dark: 'panel.background', + light: 'panel.background', + hcDark: 'panel.background', + hcLight: 'panel.background' }, localize('positronPlots.background', "Positron plots background color.")); // Positron Welcome page foreground color. @@ -2022,10 +2022,10 @@ export const POSITRON_WELCOME_SECONDARY_FOREGROUND_COLOR = registerColor('positr // Positron plots background color. export const POSITRON_WELCOME_BACKGROUND_COLOR = registerColor('positronWelcome.background', { - dark: 'terminal.background', - light: 'terminal.background', - hcDark: 'terminal.background', - hcLight: 'terminal.background' + dark: 'panel.background', + light: 'panel.background', + hcDark: 'panel.background', + hcLight: 'panel.background' }, localize('positronWelcome.background', "Positron Welcome page background color.")); // Positron Welcome page hover background. diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts index 595e37064c6..b8568466373 100644 --- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts @@ -392,11 +392,13 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme // Filter themes. switch (theme.id) { // Exclude older Visual Studio Code themes. + case 'vs vscode-theme-defaults-themes-light_modern-json': case 'vs vscode-theme-defaults-themes-light_plus-json': case 'vs vscode-theme-defaults-themes-light_vs-json': case 'vs vscode-theme-quietlight-themes-quietlight-color-theme-json': case 'vs vscode-theme-solarized-light-themes-solarized-light-color-theme-json': case 'vs-dark vscode-theme-abyss-themes-abyss-color-theme-json': + case 'vs-dark vscode-theme-defaults-themes-dark_modern-json': case 'vs-dark vscode-theme-defaults-themes-dark_plus-json': case 'vs-dark vscode-theme-defaults-themes-dark_vs-json': case 'vs-dark vscode-theme-kimbie-dark-themes-kimbie-dark-color-theme-json': diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts index aac853941a7..e6bcb797fb5 100644 --- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts @@ -44,8 +44,10 @@ export enum ThemeSettings { } export enum ThemeSettingDefaults { - COLOR_THEME_DARK = 'Default Dark Modern', - COLOR_THEME_LIGHT = 'Default Light Modern', + // --- Start Positron --- + COLOR_THEME_DARK = 'Default Positron Dark', + COLOR_THEME_LIGHT = 'Default Positron Light', + // --- End Positron --- COLOR_THEME_HC_DARK = 'Default High Contrast', COLOR_THEME_HC_LIGHT = 'Default High Contrast Light',