diff --git a/build/npm/update-theme.js b/build/npm/update-theme.js index f4b2d8f3c94ca247967fe68230fa7efa848625d4..c6d1a327b957a29147e2f1e3ca72999c0352f037 100644 --- a/build/npm/update-theme.js +++ b/build/npm/update-theme.js @@ -10,29 +10,29 @@ var fs = require('fs'); var plist = require('fast-plist'); var mappings = { - "background": ["editorBackground"], - "foreground": ["editorForeground"], - "hoverHighlight": ["editorHoverHighlight"], - "linkForeground": ["editorLinkForeground"], - "selection": ["editorSelection"], - "inactiveSelection": ["editorInactiveSelection"], - "selectionHighlightColor": ["editorSelectionHighlight"], - "wordHighlight": ["editorWordHighlight"], - "wordHighlightStrong": ["editorWordHighlightStrong"], - "findMatchHighlight": ["editorFindMatchHighlight", "peekViewEditorMatchHighlight"], - "currentFindMatchHighlight": ["editorFindMatch"], - "findRangeHighlight": ["editorFindRangeHighlight"], - "referenceHighlight": ["peekViewResultsMatchForeground"], - "lineHighlight": ["editorLineHighlight"], - "rangeHighlight": ["editorRangeHighlight"], - "caret": ["editorCursor"], - "invisibles": ["editorWhitespaces"], - "guide": ["editorIndentGuides"], - "ansiBlack": ["terminalAnsiBlack"], "ansiRed": ["terminalAnsiRed"], "ansiGreen": ["terminalAnsiGreen"], "ansiYellow": ["terminalAnsiYellow"], - "ansiBlue": ["terminalAnsiBlue"], "ansiMagenta": ["terminalAnsiMagenta"], "ansiCyan": ["terminalAnsiCyan"], "ansiWhite": ["terminalAnsiWhite"], - "ansiBrightBlack": ["terminalAnsiBrightBlack"], "ansiBrightRed": ["terminalAnsiBrightRed"], "ansiBrightGreen": ["terminalAnsiBrightGreen"], - "ansiBrightYellow": ["terminalAnsiBrightYellow"], "ansiBrightBlue": ["terminalAnsiBrightBlue"], "ansiBrightMagenta": ["terminalAnsiBrightMagenta"], - "ansiBrightCyan": ["terminalAnsiBrightCyan"], "ansiBrightWhite": ["terminalAnsiBrightWhite"] + "background": ["editor.background"], + "foreground": ["editor.foreground"], + "hoverHighlight": ["editor.hoverHighlightBackground"], + "linkForeground": ["editorLink.foreground"], + "selection": ["editor.selectionBackground"], + "inactiveSelection": ["editor.inactiveSelectionBackground"], + "selectionHighlightColor": ["editor.selectionHighlightBackground"], + "wordHighlight": ["editor.wordHighlightBackground"], + "wordHighlightStrong": ["editor.wordHighlightStrongBackground"], + "findMatchHighlight": ["editor.findMatchHighlightBackground", "peekViewEditor.matchHighlightBackground"], + "currentFindMatchHighlight": ["editor.findMatchBackground"], + "findRangeHighlight": ["editor.findRangeHighlightBackground"], + "referenceHighlight": ["peekViewResult.lineForeground"], + "lineHighlight": ["editor.lineHighlightBackground"], + "rangeHighlight": ["editor.rangeHighlightBackground"], + "caret": ["editorCursor.foreground"], + "invisibles": ["editorWhitespace.foreground"], + "guide": ["editorIndentGuide.background"], + "ansiBlack": ["terminal.ansiBlack"], "ansiRed": ["terminal.ansiRed"], "ansiGreen": ["terminal.ansiGreen"], "ansiYellow": ["terminal.ansiYellow"], + "ansiBlue": ["terminal.ansiBlue"], "ansiMagenta": ["terminal.ansiMagenta"], "ansiCyan": ["terminal.ansiCyan"], "ansiWhite": ["terminal.ansiWhite"], + "ansiBrightBlack": ["terminal.ansiBrightBlack"], "ansiBrightRed": ["terminal.ansiBrightRed"], "ansiBrightGreen": ["terminal.ansiBrightGreen"], + "ansiBrightYellow": ["terminal.ansiBrightYellow"], "ansiBrightBlue": ["terminal.ansiBrightBlue"], "ansiBrightMagenta": ["terminal.ansiBrightMagenta"], + "ansiBrightCyan": ["terminal.ansiBrightCyan"], "ansiBrightWhite": ["terminal.ansiBrightWhite"] }; exports.update = function (srcName, destName) { diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index a3c892a04034c5234d443de4c74f7c77601f790e..fc2572ec09f75df8b4b3888f4d5b2984c5f2fa53 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -255,173 +255,173 @@ // "foreground": "", "focusBorder": "#596F99", - // "widgetShadow": "", + // "widget.shadow": "", - "inputBoxBackground": "#181f2f", - // "inputBoxBorder": "", - // "inputBoxForeground": "", - "inputBoxActiveOptionBorder": "#1D4A87", - "inputValidationInfoBorder": "#384078", - "inputValidationInfoBackground": "#051336", - "inputValidationWarningBackground": "#5B7E7A", - "inputValidationWarningBorder": "#5B7E7A", - "inputValidationErrorBackground": "#A22D44", - "inputValidationErrorBorder": "#AB395B", + "input.background": "#181f2f", + // "input.border": "", + // "input.foreground": "", + "inputOption.activeBorder": "#1D4A87", + "inputValidation.infoBorder": "#384078", + "inputValidation.infoBackground": "#051336", + "inputValidation.warningBackground": "#5B7E7A", + "inputValidation.warningBorder": "#5B7E7A", + "inputValidation.errorBackground": "#A22D44", + "inputValidation.errorBorder": "#AB395B", - // "dropdownBackground": "#181f2f", - // "dropdownForeground": "", - // "dropdownBorder": "", + // "dropdown.background": "#181f2f", + // "dropdown.foreground": "", + // "dropdown.border": "", - "buttonBackground": "#455064", - "buttonHoverBackground": "#4A5C6B", - // "buttonForeground": "", + "button.background": "#455064", + "button.hoverBackground": "#4A5C6B", + // "button.foreground": "", - "listFocusAndSelectionBackground": "#08286b", - // "listFocusAndSelectionForeground": "", - "listActiveSelectionBackground": "#011B51", - // "listActiveSelectionForeground": "", - "listFocusBackground": "#08286b", - "listHoverBackground": "#041D52", - "listInactiveSelectionBackground": "#152037", - "listDropBackground": "#041D52", - // "listHighlightForeground": "", + "list.focusAndSelectionBackground": "#08286b", + // "list.focusAndSelectionForeground": "", + "list.activeSelectionBackground": "#011B51", + // "list.activeSelectionForeground": "", + "list.focusBackground": "#08286b", + "list.hoverBackground": "#041D52", + "list.inactiveSelectionBackground": "#152037", + "list.dropBackground": "#041D52", + // "list.highlightForeground": "", - "scrollbarShadow": "#515E91AA", - "scrollbarSliderActiveBackground": "#3B3F5188", - "scrollbarSliderBackground": "#1F223088", - "scrollbarSliderHoverBackground": "#3B3F5188", + "scrollbar.shadow": "#515E91AA", + "scrollbarSlider.activeBackground": "#3B3F5188", + "scrollbarSlider.background": "#1F223088", + "scrollbarSlider.hoverBackground": "#3B3F5188", // Editor - "editorBackground": "#000c18", - "editorForeground": "#6688cc", - "editorWidgetBackground": "#262641", - "editorCursor": "#ddbb88", - "editorWhitespaces": "#103050", - "editorLineHighlight": "#082050", - "editorSelection": "#770811", - "editorIndentGuides": "#002952", - "editorHoverBackground": "#000c38", - "editorHoverBorder": "#004c18", - "editorLineNumbers": "#406385", - "editorMarkerNavigationBackground": "#060621", - "editorMarkerNavigationError": "#FF0000", - "editorMarkerNavigationWarning": "#00FF00", - "editorActiveLinkForeground": "#0063a5", - // "editorFindMatch": "", - "editorFindMatchHighlight": "#eeeeee44", - // "editorFindRangeHighlight": "", - // "editorHoverHighlight": "", - // "editorInactiveSelection": "", - // "editorLineHighlightBorder": "", - "editorLinkForeground": "#0063a5", - // "editorRangeHighlight": "", - // "editorSelectionHighlight": "", - // "editorSuggestWidgetBackground": "", - // "editorSuggestWidgetBorder": "", - // "editorWordHighlight": "", - // "editorWordHighlightStrong": "", + "editor.background": "#000c18", + "editor.foreground": "#6688cc", + "editorWidget.background": "#262641", + "editorCursor.foreground": "#ddbb88", + "editorWhitespace.foreground": "#103050", + "editor.lineHighlightBackground": "#082050", + "editor.selectionBackground": "#770811", + "editorIndentGuide.background": "#002952", + "editorHoverWidget.background": "#000c38", + "editorHoverWidget.border": "#004c18", + "editorLineNumber.foreground": "#406385", + "editorMarkerNavigation.background": "#060621", + "editorMarkerNavigationError.background": "#FF0000", + "editorMarkerNavigationWarning.background": "#00FF00", + "editorLink.activeForeground": "#0063a5", + // "editor.findMatchBackground": "", + "editor.findMatchHighlightBackground": "#eeeeee44", + // "editor.findRangeHighlightBackground": "", + // "editor.hoverHighlightBackground": "", + // "editor.inactiveSelectionBackground": "", + // "editor.lineHighlightBorder": "", + "editorLink.foreground": "#0063a5", + // "editor.rangeHighlightBackground": "", + // "editor.selectionHighlightBackground": "", + // "editorSuggestWidget.background": "", + // "editorSuggestWidget.border": "", + // "editor.wordHighlightBackground": "", + // "editor.wordHighlightStrongBackground": "", // Editor: Peek View - "peekViewResultsBackground": "#060621", - // "peekViewResultsMatchForeground": "", - // "peekViewResultsSelectionBackground": "", - // "peekViewResultsSelectionForeground": "", - "peekViewEditorBackground": "#10192c", - "peekViewTitleBackground": "#10192c", - "peekViewBorder": "#2b2b4a", - "peekViewEditorMatchHighlight": "#eeeeee33", - // "peekViewResultsFileForeground": "", - "peekViewResultsMatchHighlight": "#eeeeee44", - // "peekViewTitleForeground": "", - // "peekViewTitleInfoForeground": "", + "peekViewResult.background": "#060621", + // "peekViewResult.lineForeground": "", + // "peekViewResult.selectionBackground": "", + // "peekViewResult.selectionForeground": "", + "peekViewEditor.background": "#10192c", + "peekViewTitle.background": "#10192c", + "peekView.border": "#2b2b4a", + "peekViewEditor.matchHighlightBackground": "#eeeeee33", + // "peekViewResult.fileForeground": "", + "peekViewResult.matchHighlightBackground": "#eeeeee44", + // "peekViewTitleLabel.foreground": "", + // "peekViewTitleDescription.foreground": "", // Editor: Diff - "diffEditorInserted": "#31958A55", - // "diffEditorInsertedOutline": "", - "diffEditorRemoved": "#892F4688", - // "diffEditorRemovedOutline": "", + "diffEditor.insertedTextBackground": "#31958A55", + // "diffEditor.insertedTextBorder": "", + "diffEditor.removedTextBackground": "#892F4688", + // "diffEditor.removedTextBorder": "", // Workbench: Title - "titleBarActiveBackground": "#10192c", - // "titleBarActiveForeground": "", - "titleBarInactiveBackground": "#10192caa", - // "titleBarInactiveForeground": "", + "titleBar.activeBackground": "#10192c", + // "titleBar.activeForeground": "", + "titleBar.inactiveBackground": "#10192caa", + // "titleBar.inactiveForeground": "", // Workbench: Editors - // "editorGroupHeaderBackground": "", - "editorGroupBorder": "#2b2b4a", - "editorGroupBackground": "#1c1c2a", - "editorMasterDetailsBorder": "#10192c", - "editorDragAndDropBackground": "#25375daa", + // "editorGroupHeader.noTabsBackground": "", + "editorGroup.border": "#2b2b4a", + "editorGroup.background": "#1c1c2a", + "masterDetailsEditor.border": "#10192c", + "editorGroup.dropBackground": "#25375daa", // Workbench: Tabs - "tabsContainerBackground": "#1c1c2a", - "tabBorder": "#2b2b4a", - // "tabActiveBackground": "", - "tabInactiveBackground": "#10192c", - // "tabActiveEditorGroupActiveForeground": "", - // "tabActiveEditorGroupInactiveForeground": "", - // "tabInactiveEditorGroupActiveForeground": "", - // "tabInactiveEditorGroupInactiveForeground": "", + "editorGroupHeader.tabsBackground": "#1c1c2a", + "tab.border": "#2b2b4a", + // "tab.activeBackground": "", + "tab.inactiveBackground": "#10192c", + // "tab.activeForeground": "", + // "tab.activeWithInactiveEditorGroupForeground": "", + // "tab.inactiveForeground": "", + // "tab.inactiveWithInactiveEditorGroupForeground": "", // Workbench: Activity Bar - "activityBarBackground": "#051336", - // "activityBarForeground": "", - "activityBarBadgeBackground": "#0063a5", - // "activityBarBadgeForeground": "", - // "activityBarDragAndDropBackground": "#25375daa", + "activityBar.background": "#051336", + // "activityBar.foreground": "", + "activityBarBadge.background": "#0063a5", + // "activityBarBadge.foreground": "", + // "activityBar.dropBackground": "#25375daa", // Workbench: Panel - // "panelBackground": "", - "panelBorder": "#2b2b4a", - // "panelActiveTitleBorder": "", - // "panelActiveTitleForeground": "", - // "panelInactiveTitleForeground": "", + // "panel.background": "", + "panel.border": "#2b2b4a", + // "panelTitle.activeBorder": "", + // "panelTitle.activeForeground": "", + // "panelTitle.inactiveForeground": "", // Workbench: Side Bar - "sideBarBackground": "#060621", - // "sideBarTitleForeground": "", - "sideBarSectionHeaderBackground": "#10192c", + "sideBar.background": "#060621", + // "sideBarTitle.foreground": "", + "sideBarSectionHeader.background": "#10192c", // Workbench: Status Bar - "statusBarBackground": "#10192c", - "statusBarNoFolderBackground": "#10192c", - "statusBarDebuggingBackground": "#10192c", - // "statusBarForeground": "", - "statusBarProminentItemBackground": "#0063a5", - "statusBarProminentItemHoverBackground": "#0063a5dd", - "statusBarItemActiveBackground": "#ffffff33", - "statusBarItemHoverBackground": "#ffffff22", + "statusBar.background": "#10192c", + "statusBar.noFolderBackground": "#10192c", + "statusBar.debuggingBackground": "#10192c", + // "statusBar.foreground": "", + "statusBarItem.prominentBackground": "#0063a5", + "statusBarItem.prominentHoverBackground": "#0063a5dd", + "statusBarItem.activeBackground": "#ffffff33", + "statusBarItem.hoverBackground": "#ffffff22", // Workbench: Debug - "debugToolBarBackground": "#051336", - "debugExceptionWidgetBackground": "#051336", - // "debugExceptionWidgetBorder": "", + "debugToolBar.background": "#051336", + "debugExceptionWidget.background": "#051336", + // "debugExceptionWidget.border": "", // Workbench: Notifications - "notificationsBackground": "#051336", - // "notificationsForeground": "", + "notification.background": "#051336", + // "notification.foreground": "", // Workbench: Quick Open - "pickerGroupBorder": "#596F99", - "pickerGroupForeground": "#596F99" + "pickerGroup.border": "#596F99", + "pickerGroup.foreground": "#596F99" // Workbench: Terminal - // "terminalAnsiBlack": "", - // "terminalAnsiBlue": "", - // "terminalAnsiBrightBlack": "", - // "terminalAnsiBrightBlue": "", - // "terminalAnsiBrightCyan": "", - // "terminalAnsiBrightGreen": "", - // "terminalAnsiBrightMagenta": "", - // "terminalAnsiBrightRed": "", - // "terminalAnsiBrightWhite": "", - // "terminalAnsiBrightYellow": "", - // "terminalAnsiCyan": "", - // "terminalAnsiGreen": "", - // "terminalAnsiMagenta": "", - // "terminalAnsiRed": "", - // "terminalAnsiWhite": "", - // "terminalAnsiYellow": "" + // "terminal.ansiBlack": "", + // "terminal.ansiBlue": "", + // "terminal.ansiBrightBlack": "", + // "terminal.ansiBrightBlue": "", + // "terminal.ansiBrightCyan": "", + // "terminal.ansiBrightGreen": "", + // "terminal.ansiBrightMagenta": "", + // "terminal.ansiBrightRed": "", + // "terminal.ansiBrightWhite": "", + // "terminal.ansiBrightYellow": "", + // "terminal.ansiCyan": "", + // "terminal.ansiGreen": "", + // "terminal.ansiMagenta": "", + // "terminal.ansiRed": "", + // "terminal.ansiWhite": "", + // "terminal.ansiYellow": "" } } \ No newline at end of file diff --git a/extensions/theme-defaults/themes/dark_defaults.json b/extensions/theme-defaults/themes/dark_defaults.json index d98ae61bf4f90c9ae3711396854b2aa9501c50bf..597fe8c3d4bb24d49cbe8b80239540fb81985d0e 100644 --- a/extensions/theme-defaults/themes/dark_defaults.json +++ b/extensions/theme-defaults/themes/dark_defaults.json @@ -2,10 +2,10 @@ "$schema": "vscode://schemas/color-theme", "name": "Dark Default Colors", "colors": { - "editorBackground": "#1e1e1e", - "editorForeground": "#D4D4D4", - "editorInactiveSelection": "#3A3D41", - "editorIndentGuides": "#404040", - "editorSelectionHighlight": "#add6ff26" + "editor.background": "#1e1e1e", + "editor.foreground": "#D4D4D4", + "editor.inactiveSelectionBackground": "#3A3D41", + "editorIndentGuide.background": "#404040", + "editor.selectionHighlightBackground": "#add6ff26" } } \ No newline at end of file diff --git a/extensions/theme-defaults/themes/hc_black_defaults.json b/extensions/theme-defaults/themes/hc_black_defaults.json index ec8999a7eb80fadeb21da1bc328786d67ea3eb6a..ceda83b446507989561c53b6eae1a7165e6a952d 100644 --- a/extensions/theme-defaults/themes/hc_black_defaults.json +++ b/extensions/theme-defaults/themes/hc_black_defaults.json @@ -2,8 +2,8 @@ "$schema": "vscode://schemas/color-theme", "name": "High Contrast Default Colors", "colors": { - "editorBackground": "#000000", - "editorForeground": "#FFFFFF", - "editorIndentGuides": "#FFFFFF" + "editor.background": "#000000", + "editor.foreground": "#FFFFFF", + "editorIndentGuide.background": "#FFFFFF" } } \ No newline at end of file diff --git a/extensions/theme-defaults/themes/light_defaults.json b/extensions/theme-defaults/themes/light_defaults.json index b88c1db752f18eea005c2c34c99ded0f46fc396f..091fb560b5efb99aded0cb934a7f3e6d34315d05 100644 --- a/extensions/theme-defaults/themes/light_defaults.json +++ b/extensions/theme-defaults/themes/light_defaults.json @@ -2,11 +2,11 @@ "$schema": "vscode://schemas/color-theme", "name": "Light Default Colors", "colors": { - "editorBackground": "#ffffff", - "editorForeground": "#000000", - "editorInactiveSelection": "#E5EBF1", - "editorIndentGuides": "#d3d3d3", - "editorSelectionHighlight": "#add6ff4d", - "editorSuggestWidgetBackground": "#F3F3F3" + "editor.background": "#ffffff", + "editor.foreground": "#000000", + "editor.inactiveSelectionBackground": "#E5EBF1", + "editorIndentGuide.background": "#d3d3d3", + "editor.selectionHighlightBackground": "#add6ff4d", + "editorSuggestWidget.background": "#F3F3F3" } } \ No newline at end of file diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json index 7b5beeb3a9abd01e336099b9f92987493d116d01..6f7a5dbfb787e1133d1d0bcc5b82f48a4827c6d2 100644 --- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json +++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json @@ -2,27 +2,27 @@ "name": "Kimbie Dark", "type": "dark", "colors": { - "inputBoxBackground": "#2f2f2f", - "editorBackground": "#221a0f", - "editorForeground": "#d3af86", - "editorSelection": "#84613daa", - "editorWidgetBackground": "#131510", - "editorHoverBackground": "#221a14", - "tabsContainerBackground": "#131510", - "tabInactiveBackground": "#131510", - "statusBarBackground": "#162257", - "activityBarBackground": "#221a0f", - "activityBarForeground": "#d3af86", - "activityBarBadgeBackground": "#162257", - "sideBarBackground": "#131510", - "editorLineHighlight": "#5e452b", - "editorCursor": "#d3af86", - "editorWhitespaces": "#a57a4c", - "peekViewTitleBackground": "#131510", - "peekViewBorder": "#5e452b", - "peekViewResultsBackground": "#131510", - "peekViewEditorBackground": "#221a14", - "peekViewEditorMatchHighlight": "#84613daa" + "input.background": "#2f2f2f", + "editor.background": "#221a0f", + "editor.foreground": "#d3af86", + "editor.selectionBackground": "#84613daa", + "editorWidget.background": "#131510", + "editorHoverWidget.background": "#221a14", + "editorGroupHeader.tabsBackground": "#131510", + "tab.inactiveBackground": "#131510", + "statusBar.background": "#162257", + "activityBar.background": "#221a0f", + "activityBar.foreground": "#d3af86", + "activityBarBadge.background": "#162257", + "sideBar.background": "#131510", + "editor.lineHighlightBackground": "#5e452b", + "editorCursor.foreground": "#d3af86", + "editorWhitespace.foreground": "#a57a4c", + "peekViewTitle.background": "#131510", + "peekView.border": "#5e452b", + "peekViewResult.background": "#131510", + "peekViewEditor.background": "#221a14", + "peekViewEditor.matchHighlightBackground": "#84613daa" }, "tokenColors": [ { diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json index 7c6842a0d33e8dd8bc2c96970f207761bb07ae06..15410dcf938bf36dcc65ec050f6c75c81af7a8a3 100644 --- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json +++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json @@ -3,34 +3,34 @@ "colors": { // "foreground": "#ddffff", // "focusBorder": "#00f9ff", - "dropdownBackground": "#383852", - "listActiveSelectionBackground": "#303050", - "listFocusAndSelectionBackground": "#383852", - "listInactiveSelectionBackground": "#303d45", - "listHoverBackground": "#005070", - "listDropBackground": "#505590", - "buttonBackground": "#5088a3", - "buttonHoverBackground": "#6099a3", - "editorBackground": "#202025", - "editorForeground": "#c5c8c6", - "editorSelection": "#373b41", - "editorLineHighlight": "#303030", - "editorCursor": "#fc5604", - "editorWhitespaces": "#383880", - "editorIndentGuides": "#505037", - "tabsContainerBackground": "#222228", - "tabActiveBackground": "#272740", - "tabInactiveBackground": "#333340", - "tabBorder": "#000030", - "panelActiveTitleForeground": "#ddffff", - "statusBarBackground": "#354550", - "activityBarBackground": "#292935", - "activityBarForeground": "#f0f0ff", - "activityBarBadgeBackground": "#4045b0", - "sideBarBackground": "#232327", - "sideBarSectionHeaderBackground": "#424250", - "notificationsForeground": "#ffe0ff", - "terminalAnsiWhite": "#ddffff" + "dropdown.background": "#383852", + "list.activeSelectionBackground": "#303050", + "list.focusAndSelectionBackground": "#383852", + "list.inactiveSelectionBackground": "#303d45", + "list.hoverBackground": "#005070", + "list.dropBackground": "#505590", + "button.background": "#5088a3", + "button.hoverBackground": "#6099a3", + "editor.background": "#202025", + "editor.foreground": "#c5c8c6", + "editor.selectionBackground": "#373b41", + "editor.lineHighlightBackground": "#303030", + "editorCursor.foreground": "#fc5604", + "editorWhitespace.foreground": "#383880", + "editorIndentGuide.background": "#505037", + "editorGroupHeader.tabsBackground": "#222228", + "tab.activeBackground": "#272740", + "tab.inactiveBackground": "#333340", + "tab.border": "#000030", + "panelTitle.activeForeground": "#ddffff", + "statusBar.background": "#354550", + "activityBar.background": "#292935", + "activityBar.foreground": "#f0f0ff", + "activityBarBadge.background": "#4045b0", + "sideBar.background": "#232327", + "sideBarSectionHeader.background": "#424250", + "notification.foreground": "#ffe0ff", + "terminal.ansiWhite": "#ddffff" }, "tokenColors": [ { diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json index fa6da417331c2da170bfff36bca2ee3875655a3c..c9c0ff57dc3de8992c38c559df87e988a09831de 100644 --- a/extensions/theme-monokai/themes/monokai-color-theme.json +++ b/extensions/theme-monokai/themes/monokai-color-theme.json @@ -3,35 +3,35 @@ "colors": { // "foreground": "#ddffff", // "focusBorder": "#00f9ff", - "dropdownBackground": "#383852", - "listActiveSelectionBackground": "#303070", - "listFocusBackground": "#394770", - "listFocusAndSelectionBackground": "#383852", - "listInactiveSelectionBackground": "#303d45", - "listHoverBackground": "#005070", - "listDropBackground": "#505590", - "buttonBackground": "#5088a3", - "buttonHoverBackground": "#6099a3", - "editorBackground": "#202025", - "editorForeground": "#f8f8f2", - "editorSelection": "#49483e", - "editorLineHighlight": "#303030", - "editorCursor": "#f8f8f0", - "editorWhitespaces": "#383880", - "editorIndentGuides": "#505037", - "tabsContainerBackground": "#222228", - "tabActiveBackground": "#272740", - "tabInactiveBackground": "#333340", - "tabBorder": "#000030", - "panelActiveTitleForeground": "#ddffff", - "statusBarBackground": "#354550", - "activityBarBackground": "#292935", - "activityBarBadgeForeground": "#ffffff", - "activityBarBadgeBackground": "#3655b5", - "sideBarBackground": "#232327", - "sideBarSectionHeaderBackground": "#424250", - "notificationsForeground": "#ffe0ff", - "terminalAnsiWhite": "#ddffff" + "dropdown.background": "#383852", + "list.activeSelectionBackground": "#303070", + "list.focusBackground": "#394770", + "list.focusAndSelectionBackground": "#383852", + "list.inactiveSelectionBackground": "#303d45", + "list.hoverBackground": "#005070", + "list.dropBackground": "#505590", + "button.background": "#5088a3", + "button.hoverBackground": "#6099a3", + "editor.background": "#202025", + "editor.foreground": "#f8f8f2", + "editor.selectionBackground": "#49483e", + "editor.lineHighlightBackground": "#303030", + "editorCursor.foreground": "#f8f8f0", + "editorWhitespace.foreground": "#383880", + "editorIndentGuide.background": "#505037", + "editorGroupHeader.tabsBackground": "#222228", + "tab.activeBackground": "#272740", + "tab.inactiveBackground": "#333340", + "tab.border": "#000030", + "panelTitle.activeForeground": "#ddffff", + "statusBar.background": "#354550", + "activityBar.background": "#292935", + "activityBarBadge.foreground": "#ffffff", + "activityBarBadge.background": "#3655b5", + "sideBar.background": "#232327", + "sideBarSectionHeader.background": "#424250", + "notification.foreground": "#ffe0ff", + "terminal.ansiWhite": "#ddffff" }, "tokenColors": [ diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json index dd68a955fc8067e39072c3b7bf523ec66256869e..01a9a24087b2e35ec1277b9a95d903de55df3c49 100644 --- a/extensions/theme-quietlight/themes/quietlight-color-theme.json +++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json @@ -454,32 +454,32 @@ ], "colors": { "focusBorder": "#A6B39B", - "pickerGroupForeground": "#A6B39B", - "pickerGroupBorder": "#749351", - "listActiveSelectionForeground": "#6c6c6c", - "listFocusAndSelectionForeground": "#6c6c6c", - "listFocusBackground": "#CADEB9", - "listFocusAndSelectionBackground": "#A2B294", - "listActiveSelectionBackground": "#B6C8A7", - "editorBackground": "#F5F5F5", - "editorWhitespaces": "#AAAAAA", - "editorLineHighlight": "#E4F6D4", - "editorSelection": "#C9D0D9", - "panelBackground": "#F5F5F5", - "sideBarBackground": "#F2F2F2", - "editorLineNumbers": "#9DA39A", - "editorCursor": "#54494B", - "inputBoxActiveOptionBorder": "#adafb7", - "dropdownBackground": "#F5F5F5", - "editorFindMatch": "#BF9CAC", - "editorFindMatchHighlight": "#edc9d8", - "peekViewEditorMatchHighlight": "#C2DFE3", - "peekViewTitleBackground": "#F2F8FC", - "peekViewEditorBackground": "#F2F8FC", - "peekViewResultsBackground": "#F2F8FC", - "peekViewResultsMatchHighlight": "#93C6D6", - "statusBarBackground": "#705697", - "activityBarBackground": "#EDEDF5", - "activityBarForeground": "#705697" + "pickerGroup.foreground": "#A6B39B", + "pickerGroup.border": "#749351", + "list.activeSelectionForeground": "#6c6c6c", + "list.focusAndSelectionForeground": "#6c6c6c", + "list.focusBackground": "#CADEB9", + "list.focusAndSelectionBackground": "#A2B294", + "list.activeSelectionBackground": "#B6C8A7", + "editor.background": "#F5F5F5", + "editorWhitespace.foreground": "#AAAAAA", + "editor.lineHighlightBackground": "#E4F6D4", + "editor.selectionBackground": "#C9D0D9", + "panel.background": "#F5F5F5", + "sideBar.background": "#F2F2F2", + "editorLineNumber.foreground": "#9DA39A", + "editorCursor.foreground": "#54494B", + "inputOption.activeBorder": "#adafb7", + "dropdown.background": "#F5F5F5", + "editor.findMatchBackground": "#BF9CAC", + "editor.findMatchHighlightBackground": "#edc9d8", + "peekViewEditor.matchHighlightBackground": "#C2DFE3", + "peekViewTitle.background": "#F2F8FC", + "peekViewEditor.background": "#F2F8FC", + "peekViewResult.background": "#F2F8FC", + "peekViewResult.matchHighlightBackground": "#93C6D6", + "statusBar.background": "#705697", + "activityBar.background": "#EDEDF5", + "activityBar.foreground": "#705697" } } \ No newline at end of file diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json index 08a5ae513a006e6e299955e682fd83a2fa29b1d4..ecba98b7b0abe68b38bfd0c6393f46d21c6cbed0 100644 --- a/extensions/theme-red/themes/Red-color-theme.json +++ b/extensions/theme-red/themes/Red-color-theme.json @@ -2,56 +2,56 @@ "tokenColors": "./red.tmTheme", "colors": { // window - "activityBarBadgeBackground": "#DB7E58", - "activityBarBackground": "#580000", - "tabInactiveBackground": "#300a0a", - "tabActiveBackground": "#490000", - "sideBarBackground": "#330000", - "statusBarBackground": "#700000", - "statusBarNoFolderBackground": "#700000", - "tabsContainerBackground": "#330000", - "titleBarActiveBackground": "#770000", - "titleBarInactiveBackground": "#772222", + "activityBarBadge.background": "#DB7E58", + "activityBar.background": "#580000", + "tab.inactiveBackground": "#300a0a", + "tab.activeBackground": "#490000", + "sideBar.background": "#330000", + "statusBar.background": "#700000", + "statusBar.noFolderBackground": "#700000", + "editorGroupHeader.tabsBackground": "#330000", + "titleBar.activeBackground": "#770000", + "titleBar.inactiveBackground": "#772222", // editor - "editorBackground": "#390000", - "editorGroupBorder": "#ff666633", - "editorCursor": "#970000", - "editorForeground": "#F8F8F8", - "editorWhitespaces": "#c10000", - "editorSelection": "#750000", - "editorLineNumbers": "#ff777788", - "editorWidgetBackground": "#300000", - "editorHoverBackground": "#300000", - "editorSuggestWidgetBackground": "#300000", - "editorSuggestWidgetBorder": "#220000", - "editorLineHighlight": "#ff000033", - "editorHoverHighlight": "#ff000044", - "editorSelectionHighlight": "#f5500039", - "editorLinkForeground": "#D69B6A", - "editorActiveLinkForeground": "#FFD0AA", - "peekViewTitleBackground": "#550000", - "peekViewBorder": "#ff000044", - "peekViewResultsBackground": "#400000", - "peekViewEditorBackground": "#300000", + "editor.background": "#390000", + "editorGroup.border": "#ff666633", + "editorCursor.foreground": "#970000", + "editor.foreground": "#F8F8F8", + "editorWhitespace.foreground": "#c10000", + "editor.selectionBackground": "#750000", + "editorLineNumber.foreground": "#ff777788", + "editorWidget.background": "#300000", + "editorHoverWidget.background": "#300000", + "editorSuggestWidget.background": "#300000", + "editorSuggestWidget.border": "#220000", + "editor.lineHighlightBackground": "#ff000033", + "editor.hoverHighlightBackground": "#ff000044", + "editor.selectionHighlightBackground": "#f5500039", + "editorLink.foreground": "#D69B6A", + "editorLink.activeForeground": "#FFD0AA", + "peekViewTitle.background": "#550000", + "peekView.border": "#ff000044", + "peekViewResult.background": "#400000", + "peekViewEditor.background": "#300000", // UI - "debugToolBarBackground": "#660000", + "debugToolBar.background": "#660000", "focusBorder": "#ff6666aa", - "buttonBackground": "#885555", - "buttonHoverBackground": "#aa5555", - "dropdownBackground": "#580000", - "inputBoxBackground": "#580000", - "inputBoxActiveOptionBorder": "#cc0000", - "inputValidationInfoBackground": "#550000", - "inputValidationInfoBorder": "#773333", - "listHoverBackground": "#800000", - "listActiveSelectionBackground": "#700000", - "listInactiveSelectionBackground": "#770000", - "listFocusBackground": "#660000", - "listFocusAndSelectionBackground": "#880000", - "listHighlightForeground": "#ff4444", - "notificationsBackground": "#662222", - "pickerGroupForeground": "#cc9999", - "pickerGroupBorder": "#ff000033" + "button.background": "#885555", + "button.hoverBackground": "#aa5555", + "dropdown.background": "#580000", + "input.background": "#580000", + "inputOption.activeBorder": "#cc0000", + "inputValidation.infoBackground": "#550000", + "inputValidation.infoBorder": "#773333", + "list.hoverBackground": "#800000", + "list.activeSelectionBackground": "#700000", + "list.inactiveSelectionBackground": "#770000", + "list.focusBackground": "#660000", + "list.focusAndSelectionBackground": "#880000", + "list.highlightForeground": "#ff4444", + "notification.background": "#662222", + "pickerGroup.foreground": "#cc9999", + "pickerGroup.border": "#ff000033" }, "name": "Red" } \ No newline at end of file diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index 0b321812e0c0689d67b6666a6714d1b1ab43445b..6df7eeb4a248a8a11a1ddeac0fc50fba2c7ddaf8 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -297,167 +297,167 @@ // "foreground": "", "focusBorder": "#2AA19899", - // "widgetShadow": "", + // "widget.shadow": "", - "inputBoxBackground": "#003847", - "inputBoxForeground": "#93A1A1", - "inputBoxActiveOptionBorder": "#2AA19899", - "inputValidationInfoBorder": "#384078", - "inputValidationInfoBackground": "#051336", - "inputValidationWarningBackground": "#5B7E7A", - "inputValidationWarningBorder": "#5B7E7A", - "inputValidationErrorBackground": "#A22D44", - "inputValidationErrorBorder": "#AB395B", + "input.background": "#003847", + "input.foreground": "#93A1A1", + "inputOption.activeBorder": "#2AA19899", + "inputValidation.infoBorder": "#384078", + "inputValidation.infoBackground": "#051336", + "inputValidation.warningBackground": "#5B7E7A", + "inputValidation.warningBorder": "#5B7E7A", + "inputValidation.errorBackground": "#A22D44", + "inputValidation.errorBorder": "#AB395B", - "dropdownBackground": "#00212B", - "dropdownBorder": "#2AA19899", + "dropdown.background": "#00212B", + "dropdown.border": "#2AA19899", - "buttonBackground": "#2AA19899", - "buttonHoverBackground": "#2AA19844", - // "buttonForeground": "", + "button.background": "#2AA19899", + "button.hoverBackground": "#2AA19844", + // "button.foreground": "", - "listFocusAndSelectionBackground": "#005A6F", - // "listFocusAndSelectionForeground": "", - "listActiveSelectionBackground": "#004454", - // "listActiveSelectionForeground": "", - "listFocusBackground": "#005A6F", - "listHoverBackground": "#004454AA", - "listInactiveSelectionBackground": "#00445488", - "listDropBackground": "#00445488", - // "listHighlightForeground": "", + "list.focusAndSelectionBackground": "#005A6F", + // "list.focusAndSelectionForeground": "", + "list.activeSelectionBackground": "#004454", + // "list.activeSelectionForeground": "", + "list.focusBackground": "#005A6F", + "list.hoverBackground": "#004454AA", + "list.inactiveSelectionBackground": "#00445488", + "list.dropBackground": "#00445488", + // "list.highlightForeground": "", - // "scrollbarShadow": "", - // "scrollbarSliderActiveBackground": "", - // "scrollbarSliderBackground": "", - // "scrollbarSliderHoverBackground": "", + // "scrollbar.shadow": "", + // "scrollbarSlider.activeBackground": "", + // "scrollbarSlider.background": "", + // "scrollbarSlider.hoverBackground": "", // Editor - "editorBackground": "#002B36", - "editorForeground": "#6688cc", - "editorWidgetBackground": "#00212B", - "editorCursor": "#D30102", - "editorWhitespaces": "#93A1A180", - "editorLineHighlight": "#073642", - "editorSelection": "#073642", - // "editorIndentGuides": "", - "editorHoverBackground": "#004052", - // "editorHoverBorder": "", - // "editorLineNumbers": "", - // "editorMarkerNavigationBackground": "", - // "editorMarkerNavigationError": "", - // "editorMarkerNavigationWarning": "", - // "editorActiveLinkForeground": "", - // "editorFindMatch": "", - // "editorFindMatchHighlight": "", - // "editorFindRangeHighlight": "", - // "editorHoverHighlight": "", - // "editorInactiveSelection": "", - // "editorLineHighlightBorder": "", - // "editorLinkForeground": "", - // "editorRangeHighlight": "", - // "editorSelectionHighlight": "", - // "editorSuggestWidgetBackground": "", - // "editorSuggestWidgetBorder": "", - // "editorWordHighlight": "", - // "editorWordHighlightStrong": "", + "editor.background": "#002B36", + "editor.foreground": "#6688cc", + "editorWidget.background": "#00212B", + "editorCursor.foreground": "#D30102", + "editorWhitespace.foreground": "#93A1A180", + "editor.lineHighlightBackground": "#073642", + "editor.selectionBackground": "#073642", + // "editorIndentGuide.background": "", + "editorHoverWidget.background": "#004052", + // "editorHoverWidget.border": "", + // "editorLineNumber.foreground": "", + // "editorMarkerNavigation.background": "", + // "editorMarkerNavigationError.background": "", + // "editorMarkerNavigationWarning.background": "", + // "editorLink.activeForeground": "", + // "editor.findMatchBackground": "", + // "editor.findMatchHighlightBackground": "", + // "editor.findRangeHighlightBackground": "", + // "editor.hoverHighlightBackground": "", + // "editor.inactiveSelectionBackground": "", + // "editor.lineHighlightBorder": "", + // "editorLink.foreground": "", + // "editor.rangeHighlightBackground": "", + // "editor.selectionHighlightBackground": "", + // "editorSuggestWidget.background": "", + // "editorSuggestWidget.border": "", + // "editor.wordHighlightBackground": "", + // "editor.wordHighlightStrongBackground": "", // Editor: Peek View - "peekViewResultsBackground": "#00212B", - // "peekViewResultsMatchForeground": "", - // "peekViewResultsSelectionBackground": "", - // "peekViewResultsSelectionForeground": "", - "peekViewEditorBackground": "#10192c", - "peekViewTitleBackground": "#00212B", - "peekViewBorder": "#2b2b4a", - "peekViewEditorMatchHighlight": "#7744AA40", - // "peekViewResultsFileForeground": "", - // "peekViewResultsMatchHighlight": "", - // "peekViewTitleForeground": "", - // "peekViewTitleInfoForeground": "", + "peekViewResult.background": "#00212B", + // "peekViewResult.lineForeground": "", + // "peekViewResult.selectionBackground": "", + // "peekViewResult.selectionForeground": "", + "peekViewEditor.background": "#10192c", + "peekViewTitle.background": "#00212B", + "peekView.border": "#2b2b4a", + "peekViewEditor.matchHighlightBackground": "#7744AA40", + // "peekViewResult.fileForeground": "", + // "peekViewResult.matchHighlightBackground": "", + // "peekViewTitleLabel.foreground": "", + // "peekViewTitleDescription.foreground": "", // Editor: Diff - // "diffEditorInserted": "", - // "diffEditorInsertedOutline": "", - // "diffEditorRemoved": "", - // "diffEditorRemovedOutline": "", + // "diffEditor.insertedTextBackground": "", + // "diffEditor.insertedTextBorder": "", + // "diffEditor.removedTextBackground": "", + // "diffEditor.removedTextBorder": "", // Workbench: Title - "titleBarActiveBackground": "#002C39", - "titleBarInactiveBackground": "#002C39", + "titleBar.activeBackground": "#002C39", + "titleBar.inactiveBackground": "#002C39", // Workbench: Editors - // "editorGroupHeaderBackground": "", - "editorGroupBorder": "#00212B", - "editorGroupBackground": "#011b23", - "editorMasterDetailsBorder": "#00212B", - "editorDragAndDropBackground": "#00212BAA", + // "editorGroupHeader.noTabsBackground": "", + "editorGroup.border": "#00212B", + "editorGroup.background": "#011b23", + "masterDetailsEditor.border": "#00212B", + "editorGroup.dropBackground": "#00212BAA", // Workbench: Tabs - "tabActiveEditorGroupActiveForeground": "#d6dbdb", - "tabActiveBackground": "#002B37", - "tabInactiveEditorGroupActiveForeground": "#93A1A1", - "tabInactiveBackground": "#004052", - "tabsContainerBackground": "#004052", - "tabBorder": "#003847", - "tabActiveEditorGroupInactiveForeground": "#93A1A1", - "tabInactiveEditorGroupInactiveForeground": "#93A1A1", + "tab.activeForeground": "#d6dbdb", + "tab.activeBackground": "#002B37", + "tab.inactiveForeground": "#93A1A1", + "tab.inactiveBackground": "#004052", + "editorGroupHeader.tabsBackground": "#004052", + "tab.border": "#003847", + "tab.activeWithInactiveEditorGroupForeground": "#93A1A1", + "tab.inactiveWithInactiveEditorGroupForeground": "#93A1A1", // Workbench: Activity Bar - "activityBarBackground": "#003847", - // "activityBarDragAndDropBackground": "#00212B", - "activityBarBadgeBackground": "#047aa6", + "activityBar.background": "#003847", + // "activityBar.dropBackground": "#00212B", + "activityBarBadge.background": "#047aa6", // Workbench: Panel - // "panelBackground": "", - "panelBorder": "#2b2b4a", - // "panelActiveTitleBorder": "", - // "panelActiveTitleForeground": "", - // "panelInactiveTitleForeground": "", + // "panel.background": "", + "panel.border": "#2b2b4a", + // "panelTitle.activeBorder": "", + // "panelTitle.activeForeground": "", + // "panelTitle.inactiveForeground": "", // Workbench: Side Bar - "sideBarBackground": "#00212B", - "sideBarTitleForeground": "#93A1A1", - // "sideBarSectionHeaderBackground": "", + "sideBar.background": "#00212B", + "sideBarTitle.foreground": "#93A1A1", + // "sideBarSectionHeader.background": "", // Workbench: Status Bar - "statusBarForeground": "#93A1A1", - "statusBarBackground": "#00212B", - "statusBarDebuggingBackground": "#00212B", - "statusBarNoFolderBackground": "#00212B", - "statusBarProminentItemBackground": "#003847", - "statusBarProminentItemHoverBackground": "#003847", - // "statusBarItemActiveBackground": "", - // "statusBarItemHoverBackground": "", + "statusBar.foreground": "#93A1A1", + "statusBar.background": "#00212B", + "statusBar.debuggingBackground": "#00212B", + "statusBar.noFolderBackground": "#00212B", + "statusBarItem.prominentBackground": "#003847", + "statusBarItem.prominentHoverBackground": "#003847", + // "statusBarItem.activeBackground": "", + // "statusBarItem.hoverBackground": "", // Workbench: Debug - "debugToolBarBackground": "#00212B", - "debugExceptionWidgetBackground": "#00212B", - // "debugExceptionWidgetBorder": "", + "debugToolBar.background": "#00212B", + "debugExceptionWidget.background": "#00212B", + // "debugExceptionWidget.border": "", // Workbench: Notifications - "notificationsBackground": "#003847", - // "notificationsForeground": "", + "notification.background": "#003847", + // "notification.foreground": "", // Workbench: Quick Open - "pickerGroupForeground": "#2AA19899", - "pickerGroupBorder": "#2AA19899" + "pickerGroup.foreground": "#2AA19899", + "pickerGroup.border": "#2AA19899" // Workbench: Terminal - // "terminalAnsiBlack": "", - // "terminalAnsiBlue": "", - // "terminalAnsiBrightBlack": "", - // "terminalAnsiBrightBlue": "", - // "terminalAnsiBrightCyan": "", - // "terminalAnsiBrightGreen": "", - // "terminalAnsiBrightMagenta": "", - // "terminalAnsiBrightRed": "", - // "terminalAnsiBrightWhite": "", - // "terminalAnsiBrightYellow": "", - // "terminalAnsiCyan": "", - // "terminalAnsiGreen": "", - // "terminalAnsiMagenta": "", - // "terminalAnsiRed": "", - // "terminalAnsiWhite": "", - // "terminalAnsiYellow": "" + // "terminal.ansiBlack": "", + // "terminal.ansiBlue": "", + // "terminal.ansiBrightBlack": "", + // "terminal.ansiBrightBlue": "", + // "terminal.ansiBrightCyan": "", + // "terminal.ansiBrightGreen": "", + // "terminal.ansiBrightMagenta": "", + // "terminal.ansiBrightRed": "", + // "terminal.ansiBrightWhite": "", + // "terminal.ansiBrightYellow": "", + // "terminal.ansiCyan": "", + // "terminal.ansiGreen": "", + // "terminal.ansiMagenta": "", + // "terminal.ansiRed": "", + // "terminal.ansiWhite": "", + // "terminal.ansiYellow": "" } } \ No newline at end of file diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json index 42b05f7962c54f3b66a6f7113403f5379e86dec1..f15a87fc378c1eb0103b4685fa3901e2fc5f5add 100644 --- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json +++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json @@ -292,45 +292,45 @@ } ], "colors": { - "editorBackground": "#FDF6E3", - "editorCursor": "#657B83", - "editorWhitespaces": "#586E7580", - "editorLineHighlight": "#EEE8D5", - "editorSelection": "#EEE8D5", + "editor.background": "#FDF6E3", + "editorCursor.foreground": "#657B83", + "editorWhitespace.foreground": "#586E7580", + "editor.lineHighlightBackground": "#EEE8D5", + "editor.selectionBackground": "#EEE8D5", - "sideBarBackground": "#EEE8D5", - "sideBarTitleForeground": "#586E75", - "activityBarBackground": "#DDD6C1", - "activityBarForeground": "#584c27", - "activityBarDragAndDropBackground": "#EEE8D5", - "activityBarBadgeBackground": "#B58900", - "editorWidgetBackground": "#EEE8D5", - "inputBoxBackground": "#DDD6C1", - "inputBoxForeground": "#586E75", - "inputBoxActiveOptionBorder": "#2AA19899", + "sideBar.background": "#EEE8D5", + "sideBarTitle.foreground": "#586E75", + "activityBar.background": "#DDD6C1", + "activityBar.foreground": "#584c27", + "activityBar.dropBackground": "#EEE8D5", + "activityBarBadge.background": "#B58900", + "editorWidget.background": "#EEE8D5", + "input.background": "#DDD6C1", + "input.foreground": "#586E75", + "inputOption.activeBorder": "#2AA19899", "focusBorder": "#2AA19899", - "titleBarActiveBackground": "#002C39", - "titleBarInactiveBackground": "#002C39", - "statusBarForeground": "#586E75", - "statusBarBackground": "#EEE8D5", - "statusBarDebuggingBackground": "#EEE8D5", - "statusBarNoFolderBackground": "#EEE8D5", - // "tabActiveEditorGroupActiveForeground": "#d6dbdb", - "tabActiveBackground": "#FDF6E3", - "tabInactiveEditorGroupActiveForeground": "#586E75", - "tabInactiveBackground": "#CCC4B0", - "tabsContainerBackground": "#CCC4B0", - "tabBorder": "#DDD6C1", - // "tabActiveEditorGroupInactiveForeground": "#586E75", - // "tabInactiveEditorGroupInactiveForeground": "#586E75", - "debugToolBarBackground": "#EEE8D5", - "dropdownBackground": "#EEE8D5", - "dropdownBorder": "#2AA19899", + "titleBar.activeBackground": "#002C39", + "titleBar.inactiveBackground": "#002C39", + "statusBar.foreground": "#586E75", + "statusBar.background": "#EEE8D5", + "statusBar.debuggingBackground": "#EEE8D5", + "statusBar.noFolderBackground": "#EEE8D5", + // "tab.activeForeground": "#d6dbdb", + "tab.activeBackground": "#FDF6E3", + "tab.inactiveForeground": "#586E75", + "tab.inactiveBackground": "#CCC4B0", + "editorGroupHeader.tabsBackground": "#CCC4B0", + "tab.border": "#DDD6C1", + // "tab.activeWithInactiveEditorGroupForeground": "#586E75", + // "tab.inactiveWithInactiveEditorGroupForeground": "#586E75", + "debugToolBar.background": "#EEE8D5", + "dropdown.background": "#EEE8D5", + "dropdown.border": "#2AA19899", - "peekViewResultsBackground": "#EEE8D5", - "peekViewTitleBackground": "#EEE8D5", - "peekViewEditorMatchHighlight": "#7744AA40", - "editorHoverBackground": "#CCC4B0" + "peekViewResult.background": "#EEE8D5", + "peekViewTitle.background": "#EEE8D5", + "peekViewEditor.matchHighlightBackground": "#7744AA40", + "editorHoverWidget.background": "#CCC4B0" } } \ No newline at end of file diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json index ae48833a5c2590f4a8936b85e511efdd46d70b38..5510699e539731bb6f3a5bb101c5caffb295934b 100644 --- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json +++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json @@ -2,50 +2,50 @@ "type": "dark", "colors": { "focusBorder": "#bbdaff", - "inputBoxBackground": "#001733", - "dropdownBackground": "#001733", - "listFocusBackground": "#ffffff60", - "listActiveSelectionBackground": "#ffffff50", - "listFocusAndSelectionBackground": "#ffffff60", - "listInactiveSelectionBackground": "#ffffff40", - "listHoverBackground": "#ffffff30", - "listDropBackground": "#ffffff60", - "pickerGroupForeground": "#bbdaff", - "editorBackground": "#002451", - "editorForeground": "#ffffff", - "editorSelection": "#003f8e", - "editorLineHighlight": "#00346e", - "editorCursor": "#ffffff", - "editorWhitespaces": "#404f7d", - "editorWidgetBackground": "#001c40", - "editorHoverBackground": "#001c40", - "editorHoverBorder": "#ffffff44", - "editorGroupBorder": "#404f7d", - "tabsContainerBackground": "#001733", - "tabInactiveBackground": "#001c40", - "statusBarBackground": "#001126", - "statusBarNoFolderBackground": "#001126", - "activityBarBackground": "#001733", - "activityBarBadgeBackground": "#bbdaff", - "activityBarBadgeForeground": "#001733", - "sideBarBackground": "#001c40", - "statusBarDebuggingBackground": "#ffeead", - "terminalAnsiBlack": "#111111", - "terminalAnsiRed": "#ff9da4", - "terminalAnsiGreen": "#d1f1a9", - "terminalAnsiYellow": "#ffeead", - "terminalAnsiBlue": "#bbdaff", - "terminalAnsiMagenta": "#ebbbff", - "terminalAnsiCyan": "#99ffff", - "terminalAnsiWhite": "#cccccc", - "terminalAnsiBrightBlack": "#333333", - "terminalAnsiBrightRed": "#ff7882", - "terminalAnsiBrightGreen": "#b8f171", - "terminalAnsiBrightYellow": "#ffe580", - "terminalAnsiBrightBlue": "#80baff", - "terminalAnsiBrightMagenta": "#d778ff", - "terminalAnsiBrightCyan": "#78ffff", - "terminalAnsiBrightWhite": "#ffffff" + "input.background": "#001733", + "dropdown.background": "#001733", + "list.focusBackground": "#ffffff60", + "list.activeSelectionBackground": "#ffffff50", + "list.focusAndSelectionBackground": "#ffffff60", + "list.inactiveSelectionBackground": "#ffffff40", + "list.hoverBackground": "#ffffff30", + "list.dropBackground": "#ffffff60", + "pickerGroup.foreground": "#bbdaff", + "editor.background": "#002451", + "editor.foreground": "#ffffff", + "editor.selectionBackground": "#003f8e", + "editor.lineHighlightBackground": "#00346e", + "editorCursor.foreground": "#ffffff", + "editorWhitespace.foreground": "#404f7d", + "editorWidget.background": "#001c40", + "editorHoverWidget.background": "#001c40", + "editorHoverWidget.border": "#ffffff44", + "editorGroup.border": "#404f7d", + "editorGroupHeader.tabsBackground": "#001733", + "tab.inactiveBackground": "#001c40", + "statusBar.background": "#001126", + "statusBar.noFolderBackground": "#001126", + "activityBar.background": "#001733", + "activityBarBadge.background": "#bbdaff", + "activityBarBadge.foreground": "#001733", + "sideBar.background": "#001c40", + "statusBar.debuggingBackground": "#ffeead", + "terminal.ansiBlack": "#111111", + "terminal.ansiRed": "#ff9da4", + "terminal.ansiGreen": "#d1f1a9", + "terminal.ansiYellow": "#ffeead", + "terminal.ansiBlue": "#bbdaff", + "terminal.ansiMagenta": "#ebbbff", + "terminal.ansiCyan": "#99ffff", + "terminal.ansiWhite": "#cccccc", + "terminal.ansiBrightBlack": "#333333", + "terminal.ansiBrightRed": "#ff7882", + "terminal.ansiBrightGreen": "#b8f171", + "terminal.ansiBrightYellow": "#ffe580", + "terminal.ansiBrightBlue": "#80baff", + "terminal.ansiBrightMagenta": "#d778ff", + "terminal.ansiBrightCyan": "#78ffff", + "terminal.ansiBrightWhite": "#ffffff" }, "tokenColors": [ { diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index df8c421914bc8ac7efbe951386fdb081063793e0..10a24f7f8cceef2af6b3f4487cb16c0e45dcdf43 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -1954,10 +1954,10 @@ function createFakeLinesDiv(): HTMLElement { const defaultInsertColor = Color.fromRGBA(new RGBA(155, 185, 85, 255 * 0.2)); const defaultRemoveColor = Color.fromRGBA(new RGBA(255, 0, 0, 255 * 0.2)); -export const diffInserted = registerColor('diffEditorInserted', { dark: defaultInsertColor, light: defaultInsertColor, hc: null }, nls.localize('diffEditorInserted', 'Background color for text that got inserted.')); -export const diffRemoved = registerColor('diffEditorRemoved', { dark: defaultRemoveColor, light: defaultRemoveColor, hc: null }, nls.localize('diffEditorRemoved', 'Background color for text that got removed.')); -export const diffInsertedOutline = registerColor('diffEditorInsertedOutline', { dark: null, light: null, hc: '#33ff2eff' }, nls.localize('diffEditorInsertedOutline', 'Outline color for the text that got inserted.')); -export const diffRemovedOutline = registerColor('diffEditorRemovedOutline', { dark: null, light: null, hc: '#FF008F' }, nls.localize('diffEditorRemovedOutline', 'Outline color for text that got removed.')); +export const diffInserted = registerColor('diffEditor.insertedTextBackground', { dark: defaultInsertColor, light: defaultInsertColor, hc: null }, nls.localize('diffEditorInserted', 'Background color for text that got inserted.')); +export const diffRemoved = registerColor('diffEditor.removedTextBackground', { dark: defaultRemoveColor, light: defaultRemoveColor, hc: null }, nls.localize('diffEditorRemoved', 'Background color for text that got removed.')); +export const diffInsertedOutline = registerColor('diffEditor.insertedTextBorder', { dark: null, light: null, hc: '#33ff2eff' }, nls.localize('diffEditorInsertedOutline', 'Outline color for the text that got inserted.')); +export const diffRemovedOutline = registerColor('diffEditor.removedTextBorder', { dark: null, light: null, hc: '#FF008F' }, nls.localize('diffEditorRemovedOutline', 'Outline color for text that got removed.')); registerThemingParticipant((theme, collector) => { diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts index 662f89656a815fb3cfc93f986c4413eb34b3ad94..e6a96f190434f990ebd2103c26cc98bd1ff97072 100644 --- a/src/vs/editor/common/view/editorColorRegistry.ts +++ b/src/vs/editor/common/view/editorColorRegistry.ts @@ -11,13 +11,13 @@ import { Color } from 'vs/base/common/color'; /** * Definition of the editor colors */ -export const editorLineHighlight = registerColor('editorLineHighlight', { dark: null, light: null, hc: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.')); -export const editorLineHighlightBorder = registerColor('editorLineHighlightBorder', { dark: '#282828', light: '#eeeeee', hc: '#f38518' }, nls.localize('lineHighlightBorderBox', 'Background color for the border around the line at the cursor position.')); -export const editorRangeHighlight = registerColor('editorRangeHighlight', { dark: '#ffffff0b', light: '#fdff0033', hc: null }, nls.localize('rangeHighlight', 'Background color of highlighted ranges, like by quick open and find features.')); -export const editorCursor = registerColor('editorCursor', { dark: '#AEAFAD', light: Color.black, hc: Color.white }, nls.localize('caret', 'Color of the editor cursor.')); -export const editorWhitespaces = registerColor('editorWhitespaces', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.')); -export const editorIndentGuides = registerColor('editorIndentGuides', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.')); -export const editorLineNumbers = registerColor('editorLineNumbers', { dark: '#5A5A5A', light: '#2B91AF', hc: Color.white }, nls.localize('editorLineNumbers', 'Color of editor line numbers.')); +export const editorLineHighlight = registerColor('editor.lineHighlightBackground', { dark: null, light: null, hc: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.')); +export const editorLineHighlightBorder = registerColor('editor.lineHighlightBorder', { dark: '#282828', light: '#eeeeee', hc: '#f38518' }, nls.localize('lineHighlightBorderBox', 'Background color for the border around the line at the cursor position.')); +export const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hc: null }, nls.localize('rangeHighlight', 'Background color of highlighted ranges, like by quick open and find features.')); +export const editorCursor = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hc: Color.white }, nls.localize('caret', 'Color of the editor cursor.')); +export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.')); +export const editorIndentGuides = registerColor('editorIndentGuide.background', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.')); +export const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#5A5A5A', light: '#2B91AF', hc: Color.white }, nls.localize('editorLineNumbers', 'Color of editor line numbers.')); // contains all color rules that used to defined in editor/browser/widget/editor.css diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts index 4c6a75505073c592433581d97da81d0ca52a7f33..30de9d1b44621082e5b65418f6b4f0b62a0d6133 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts @@ -486,6 +486,6 @@ CommonEditorRegistry.registerEditorCommand(new MarkerCommand({ // theming -export const editorMarkerNavigationError = registerColor('editorMarkerNavigationError', { dark: '#ff5a5a', light: '#ff5a5a', hc: '#ff5a5a' }, nls.localize('editorMarkerNavigationError', 'Editor marker navigation widget error color.')); -export const editorMarkerNavigationWarning = registerColor('editorMarkerNavigationWarning', { dark: '#5aac5a', light: '#5aac5a', hc: '#5aac5a' }, nls.localize('editorMarkerNavigationWarning', 'Editor marker navigation widget warning color.')); -export const editorMarkerNavigationBackground = registerColor('editorMarkerNavigationBackground', { dark: '#2D2D30', light: Color.white, hc: '#0C141F' }, nls.localize('editorMarkerNavigationBackground', 'Editor marker navigation widget background.')); +export const editorMarkerNavigationError = registerColor('editorMarkerNavigationError.background', { dark: '#ff5a5a', light: '#ff5a5a', hc: '#ff5a5a' }, nls.localize('editorMarkerNavigationError', 'Editor marker navigation widget error color.')); +export const editorMarkerNavigationWarning = registerColor('editorMarkerNavigationWarning.background', { dark: '#5aac5a', light: '#5aac5a', hc: '#5aac5a' }, nls.localize('editorMarkerNavigationWarning', 'Editor marker navigation widget warning color.')); +export const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', { dark: '#2D2D30', light: Color.white, hc: '#0C141F' }, nls.localize('editorMarkerNavigationBackground', 'Editor marker navigation widget background.')); diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts index b2625ee0fd092f1d581b91e5d9b7653f343f6644..6e424a667d65d6a660d80228071cb5dcf43ea52b 100644 --- a/src/vs/editor/contrib/hover/browser/hover.ts +++ b/src/vs/editor/contrib/hover/browser/hover.ts @@ -174,9 +174,9 @@ class ShowHoverAction extends EditorAction { // theming -export const editorHoverHighlight = registerColor('editorHoverHighlight', { light: '#ADD6FF26', dark: '#264f7840', hc: '#ADD6FF26' }, nls.localize('hoverHighlight', 'Highlight below the word for which a hover is shown.')); -export const editorHoverBackground = registerColor('editorHoverBackground', { light: '#F3F3F3', dark: '#2D2D30', hc: '#0C141F' }, nls.localize('hoverBackground', 'Background color of the editor hover.')); -export const editorHoverBorder = registerColor('editorHoverBorder', { light: '#CCCCCC', dark: '#555555', hc: '#CCCCCC' }, nls.localize('hoverBorder', 'Border color of the editor hover.')); +export const editorHoverHighlight = registerColor('editor.hoverHighlightBackground', { light: '#ADD6FF26', dark: '#264f7840', hc: '#ADD6FF26' }, nls.localize('hoverHighlight', 'Highlight below the word for which a hover is shown.')); +export const editorHoverBackground = registerColor('editorHoverWidget.background', { light: '#F3F3F3', dark: '#2D2D30', hc: '#0C141F' }, nls.localize('hoverBackground', 'Background color of the editor hover.')); +export const editorHoverBorder = registerColor('editorHoverWidget.border', { light: '#CCCCCC', dark: '#555555', hc: '#CCCCCC' }, nls.localize('hoverBorder', 'Border color of the editor hover.')); registerThemingParticipant((theme, collector) => { let editorHoverHighlightColor = theme.getColor(editorHoverHighlight); diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts index c23aad4e08c50255814f5f22c81b2666ede4006d..097aa4ed1c59b01219f321d677074ba9d0568642 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts @@ -797,20 +797,20 @@ export class ReferenceWidget extends PeekViewWidget { // theming -export const peekViewTitleBackground = registerColor('peekViewTitleBackground', { dark: '#1E1E1E', light: '#FFFFFF', hc: '#0C141F' }, nls.localize('peekViewTitleBackground', 'Background color of the peek view title area.')); -export const peekViewTitleForeground = registerColor('peekViewTitleForeground', { dark: '#FFFFFF', light: '#333333', hc: '#FFFFFF' }, nls.localize('peekViewTitleForeground', 'Color of the peek view title.')); -export const peekViewTitleInfoForeground = registerColor('peekViewTitleInfoForeground', { dark: '#ccccccb3', light: '#6c6c6cb3', hc: '#FFFFFF99' }, nls.localize('peekViewTitleInfoForeground', 'Color of the peek view title info.')); -export const peekViewBorder = registerColor('peekViewBorder', { dark: '#007acc', light: '#007acc', hc: contrastBorder }, nls.localize('peekViewBorder', 'Color of the peek view borders and arrow.')); - -export const peekViewResultsBackground = registerColor('peekViewResultsBackground', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('peekViewResultsBackground', 'Background color of the peek view result list.')); -export const peekViewResultsMatchForeground = registerColor('peekViewResultsMatchForeground', { dark: '#bbbbbb', light: '#646465', hc: Color.white }, nls.localize('peekViewResultsMatchForeground', 'Match entry foreground in the peek view result list.')); -export const peekViewResultsFileForeground = registerColor('peekViewResultsFileForeground', { dark: Color.white, light: '#1E1E1E', hc: Color.white }, nls.localize('peekViewResultsFileForeground', 'File entry foreground in the peek view result list.')); -export const peekViewResultsSelectionBackground = registerColor('peekViewResultsSelectionBackground', { dark: '#3399ff33', light: '#3399ff33', hc: null }, nls.localize('peekViewResultsSelectionBackground', 'Background color of the selected entry in the peek view result list.')); -export const peekViewResultsSelectionForeground = registerColor('peekViewResultsSelectionForeground', { dark: Color.white, light: '#6C6C6C', hc: Color.white }, nls.localize('peekViewResultsSelectionForeground', 'Foreground color of the selected entry in the peek view result list.')); -export const peekViewEditorBackground = registerColor('peekViewEditorBackground', { dark: '#001F33', light: '#F2F8FC', hc: Color.black }, nls.localize('peekViewEditorBackground', 'Background color of the peek view editor.')); - -export const peekViewResultsMatchHighlight = registerColor('peekViewResultsMatchHighlight', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('peekViewResultsMatchHighlight', 'Match highlight color in the peek view result list.')); -export const peekViewEditorMatchHighlight = registerColor('peekViewEditorMatchHighlight', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('peekViewEditorMatchHighlight', 'Match highlight color in the peek view editor.')); +export const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#1E1E1E', light: '#FFFFFF', hc: '#0C141F' }, nls.localize('peekViewTitleBackground', 'Background color of the peek view title area.')); +export const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: '#FFFFFF', light: '#333333', hc: '#FFFFFF' }, nls.localize('peekViewTitleForeground', 'Color of the peek view title.')); +export const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#6c6c6cb3', hc: '#FFFFFF99' }, nls.localize('peekViewTitleInfoForeground', 'Color of the peek view title info.')); +export const peekViewBorder = registerColor('peekView.border', { dark: '#007acc', light: '#007acc', hc: contrastBorder }, nls.localize('peekViewBorder', 'Color of the peek view borders and arrow.')); + +export const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('peekViewResultsBackground', 'Background color of the peek view result list.')); +export const peekViewResultsMatchForeground = registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hc: Color.white }, nls.localize('peekViewResultsMatchForeground', 'Match entry foreground in the peek view result list.')); +export const peekViewResultsFileForeground = registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hc: Color.white }, nls.localize('peekViewResultsFileForeground', 'File entry foreground in the peek view result list.')); +export const peekViewResultsSelectionBackground = registerColor('peekViewResult.selectionBackground', { dark: '#3399ff33', light: '#3399ff33', hc: null }, nls.localize('peekViewResultsSelectionBackground', 'Background color of the selected entry in the peek view result list.')); +export const peekViewResultsSelectionForeground = registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hc: Color.white }, nls.localize('peekViewResultsSelectionForeground', 'Foreground color of the selected entry in the peek view result list.')); +export const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hc: Color.black }, nls.localize('peekViewEditorBackground', 'Background color of the peek view editor.')); + +export const peekViewResultsMatchHighlight = registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('peekViewResultsMatchHighlight', 'Match highlight color in the peek view result list.')); +export const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('peekViewEditorMatchHighlight', 'Match highlight color in the peek view editor.')); registerThemingParticipant((theme, collector) => { diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts index 729331aa2773c6e6a63b328adf90ed72615e01d1..cb72555451c2db824fd2a4a1a599700c21965a73 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts @@ -47,11 +47,11 @@ interface ISuggestionTemplateData { /** * Suggest widget colors */ -export const editorSuggestWidgetBackground = registerColor('editorSuggestWidgetBackground', { dark: editorWidgetBackground, light: editorWidgetBackground, hc: editorWidgetBackground }, nls.localize('editorSuggestWidgetBackground', 'Background color of the suggest widget.')); -export const editorSuggestWidgetBorder = registerColor('editorSuggestWidgetBorder', { dark: '#454545', light: '#C8C8C8', hc: contrastBorder }, nls.localize('editorSuggestWidgetBorder', 'Border color of the suggest widget.')); -export const editorSuggestWidgetForeground = registerColor('editorSuggestWidgetForeground', { dark: editorForeground, light: editorForeground, hc: editorForeground }, nls.localize('editorSuggestWidgetForeground', 'Foreground color of the suggest widget.')); -export const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidgetSelectedBackground', { dark: listFocusBackground, light: listFocusBackground, hc: listFocusBackground }, nls.localize('editorSuggestWidgetSelectedBackground', 'Background color of the selected entry in the suggest widget.')); -export const editorSuggestWidgetHighlightForeground = registerColor('editorSuggestWidgetHighlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hc: listHighlightForeground }, nls.localize('editorSuggestWidgetHighlightForeground', 'Color of the match highlights in the suggest widget.')); +export const editorSuggestWidgetBackground = registerColor('editorSuggestWidget.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hc: editorWidgetBackground }, nls.localize('editorSuggestWidgetBackground', 'Background color of the suggest widget.')); +export const editorSuggestWidgetBorder = registerColor('editorSuggestWidget.border', { dark: '#454545', light: '#C8C8C8', hc: contrastBorder }, nls.localize('editorSuggestWidgetBorder', 'Border color of the suggest widget.')); +export const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', { dark: editorForeground, light: editorForeground, hc: editorForeground }, nls.localize('editorSuggestWidgetForeground', 'Foreground color of the suggest widget.')); +export const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', { dark: listFocusBackground, light: listFocusBackground, hc: listFocusBackground }, nls.localize('editorSuggestWidgetSelectedBackground', 'Background color of the selected entry in the suggest widget.')); +export const editorSuggestWidgetHighlightForeground = registerColor('editorSuggestWidget.highlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hc: listHighlightForeground }, nls.localize('editorSuggestWidgetHighlightForeground', 'Color of the match highlights in the suggest widget.')); const colorRegExp = /^(#([\da-f]{3}){1,2}|(rgb|hsl)a\(\s*(\d{1,3}%?\s*,\s*){3}(1|0?\.\d+)\)|(rgb|hsl)\(\s*\d{1,3}%?(\s*,\s*\d{1,3}%?){2}\s*\))$/i; diff --git a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts index 8adf5cded6db0e383e6779a144423aef6eb00cac..720a2871a70a72e51cd43b86eccfee37fc779fe4 100644 --- a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts +++ b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts @@ -19,8 +19,8 @@ import { registerColor, editorSelectionHighlight, activeContrastBorder } from 'v import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents'; -export const editorWordHighlight = registerColor('editorWordHighlight', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable.')); -export const editorWordHighlightStrong = registerColor('editorWordHighlightStrong', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable.')); +export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable.')); +export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable.')); export function getOccurrencesAtPosition(model: editorCommon.IReadOnlyModel, position: Position): TPromise { diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts index c86e37e4e5a88e6a3f98f010f159d4e70168bb16..1617e698148e3ee2776e9ba31f2edd2761eabaeb 100644 --- a/src/vs/platform/theme/common/colorRegistry.ts +++ b/src/vs/platform/theme/common/colorRegistry.ts @@ -123,84 +123,84 @@ export const foreground = registerColor('foreground', { dark: '#CCCCCC', light: export const focusBorder = registerColor('focusBorder', { dark: Color.fromRGBA(new RGBA(14, 99, 156)).transparent(0.6), light: Color.fromRGBA(new RGBA(0, 122, 204)).transparent(0.4), hc: '#F38518' }, nls.localize('focusBorder', "Overall border color for focused elements. This color is only used if not overridden by a component.")); export const contrastBorder = registerColor('contrastBorder', { light: null, dark: null, hc: '#6FC3DF' }, nls.localize('contrastBorder', "An extra border around elements to separate them from others for greater contrast.")); -export const activeContrastBorder = registerColor('activeContrastBorder', { light: null, dark: null, hc: focusBorder }, nls.localize('activeContrastBorder', "An extra border around active elements to separate them from others for greater contrast.")); +export const activeContrastBorder = registerColor('contrastActiveBorder', { light: null, dark: null, hc: focusBorder }, nls.localize('activeContrastBorder', "An extra border around active elements to separate them from others for greater contrast.")); // ----- widgets -export const widgetShadow = registerColor('widgetShadow', { dark: '#000000', light: '#A8A8A8', hc: null }, nls.localize('widgetShadow', 'Shadow color of widgets such as find/replace inside the editor.')); - -export const inputBackground = registerColor('inputBoxBackground', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('inputBoxBackground', "Input box background.")); -export const inputForeground = registerColor('inputBoxForeground', { dark: foreground, light: foreground, hc: foreground }, nls.localize('inputBoxForeground', "Input box foreground.")); -export const inputBorder = registerColor('inputBoxBorder', { dark: null, light: null, hc: contrastBorder }, nls.localize('inputBoxBorder', "Input box border.")); -export const inputActiveOptionBorder = registerColor('inputBoxActiveOptionBorder', { dark: '#007ACC', light: '#007ACC', hc: activeContrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields.")); -export const inputValidationInfoBackground = registerColor('inputValidationInfoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('inputValidationInfoBackground', "Input validation background color for information severity.")); -export const inputValidationInfoBorder = registerColor('inputValidationInfoBorder', { dark: '#55AAFF', light: '#009CCC', hc: '#6FC3DF' }, nls.localize('inputValidationInfoBorder', "Input validation border color for information severity.")); -export const inputValidationWarningBackground = registerColor('inputValidationWarningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('inputValidationWarningBackground', "Input validation background color for information warning.")); -export const inputValidationWarningBorder = registerColor('inputValidationWarningBorder', { dark: '#B89500', light: '#F2CB1D', hc: '#B89500' }, nls.localize('inputValidationWarningBorder', "Input validation border color for warning severity.")); -export const inputValidationErrorBackground = registerColor('inputValidationErrorBackground', { dark: '#5A1D1D', light: '#F2DEDE', hc: Color.black }, nls.localize('inputValidationErrorBackground', "Input validation background color for error severity.")); -export const inputValidationErrorBorder = registerColor('inputValidationErrorBorder', { dark: '#BE1100', light: '#E51400', hc: '#BE1100' }, nls.localize('inputValidationErrorBorder', "Input validation border color for error severity.")); - -export const selectBackground = registerColor('dropdownBackground', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('dropdownBackground', "Dropdown background.")); -export const selectForeground = registerColor('dropdownForeground', { dark: '#F0F0F0', light: null, hc: Color.white }, nls.localize('dropdownForeground', "Dropdown foreground.")); -export const selectBorder = registerColor('dropdownBorder', { dark: selectBackground, light: '#CECECE', hc: contrastBorder }, nls.localize('dropdownBorder', "Dropdown border.")); - -export const listFocusBackground = registerColor('listFocusBackground', { dark: '#073655', light: '#DCEBFC', hc: null }, nls.localize('listFocusBackground', "List/Tree background color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not.")); -export const listActiveSelectionBackground = registerColor('listActiveSelectionBackground', { dark: '#0E639C', light: '#4FA7FF', hc: null }, nls.localize('listActiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not.")); -export const listInactiveSelectionBackground = registerColor('listInactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not.")); -export const listActiveSelectionForeground = registerColor('listActiveSelectionForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not.")); -export const listFocusAndSelectionBackground = registerColor('listFocusAndSelectionBackground', { dark: '#094771', light: '#3399FF', hc: null }, nls.localize('listFocusAndSelectionBackground', "List/Tree background color for the focused and selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not. This color wins over the individual selection and focus colors.")); -export const listFocusAndSelectionForeground = registerColor('listFocusAndSelectionForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('listFocusAndSelectionForeground', "List/Tree foreground color for the focused and selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not. This color wins over the individual selection and focus colors.")); -export const listHoverBackground = registerColor('listHoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse.")); -export const listDropBackground = registerColor('listDropBackground', { dark: '#383B3D', light: '#DDECFF', hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse.")); -export const listHighlightForeground = registerColor('listHighlightForeground', { dark: '#219AE4', light: '#186B9E', hc: '#219AE4' }, nls.localize('highlight', 'List/Tree foreground color of the match highlights when searching inside the list/tree.')); - -export const pickerGroupForeground = registerColor('pickerGroupForeground', { dark: Color.fromHex('#0097FB').transparent(0.6), light: Color.fromHex('#007ACC').transparent(0.6), hc: Color.white }, nls.localize('pickerGroupForeground', "Quick picker color for grouping labels.")); -export const pickerGroupBorder = registerColor('pickerGroupBorder', { dark: '#3F3F46', light: '#CCCEDB', hc: Color.white }, nls.localize('pickerGroupBorder', "Quick picker color for grouping borders.")); - -export const buttonForeground = registerColor('buttonForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('buttonForeground', "Button foreground color.")); -export const buttonBackground = registerColor('buttonBackground', { dark: '#0E639C', light: '#007ACC', hc: null }, nls.localize('buttonBackground', "Button background color.")); -export const buttonHoverBackground = registerColor('buttonHoverBackground', { dark: '#006BB3', light: '#006BB3', hc: null }, nls.localize('buttonHoverBackground', "Button background color when hovering.")); - -export const scrollbarShadow = registerColor('scrollbarShadow', { dark: '#000000', light: '#DDDDDD', hc: null }, nls.localize('scrollbarShadow', "Scrollbar shadow to indicate that the view is scrolled.")); -export const scrollbarSliderBackground = registerColor('scrollbarSliderBackground', { dark: Color.fromHex('#797979').transparent(0.4), light: Color.fromHex('#646464').transparent(0.4), hc: Color.fromHex(contrastBorder).transparent(0.6) }, nls.localize('scrollbarSliderBackground', "Slider background color.")); -export const scrollbarSliderHoverBackground = registerColor('scrollbarSliderHoverBackground', { dark: Color.fromHex('#646464').transparent(0.7), light: Color.fromHex('#646464').transparent(0.7), hc: Color.fromHex(contrastBorder).transparent(0.8) }, nls.localize('scrollbarSliderHoverBackground', "Slider background color when hovering.")); -export const scrollbarSliderActiveBackground = registerColor('scrollbarSliderActiveBackground', { dark: Color.fromHex('#BFBFBF').transparent(0.4), light: Color.fromHex('#000000').transparent(0.6), hc: Color.fromHex(contrastBorder) }, nls.localize('scrollbarSliderActiveBackground', "Slider background color when active.")); +export const widgetShadow = registerColor('widget.shadow', { dark: '#000000', light: '#A8A8A8', hc: null }, nls.localize('widgetShadow', 'Shadow color of widgets such as find/replace inside the editor.')); + +export const inputBackground = registerColor('input.background', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('inputBoxBackground', "Input box background.")); +export const inputForeground = registerColor('input.foreground', { dark: foreground, light: foreground, hc: foreground }, nls.localize('inputBoxForeground', "Input box foreground.")); +export const inputBorder = registerColor('input.border', { dark: null, light: null, hc: contrastBorder }, nls.localize('inputBoxBorder', "Input box border.")); +export const inputActiveOptionBorder = registerColor('inputOption.activeBorder', { dark: '#007ACC', light: '#007ACC', hc: activeContrastBorder }, nls.localize('inputBoxActiveOptionBorder', "Border color of activated options in input fields.")); +export const inputValidationInfoBackground = registerColor('inputValidation.infoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('inputValidationInfoBackground', "Input validation background color for information severity.")); +export const inputValidationInfoBorder = registerColor('inputValidation.infoBorder', { dark: '#55AAFF', light: '#009CCC', hc: '#6FC3DF' }, nls.localize('inputValidationInfoBorder', "Input validation border color for information severity.")); +export const inputValidationWarningBackground = registerColor('inputValidation.warningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('inputValidationWarningBackground', "Input validation background color for information warning.")); +export const inputValidationWarningBorder = registerColor('inputValidation.warningBorder', { dark: '#B89500', light: '#F2CB1D', hc: '#B89500' }, nls.localize('inputValidationWarningBorder', "Input validation border color for warning severity.")); +export const inputValidationErrorBackground = registerColor('inputValidation.errorBackground', { dark: '#5A1D1D', light: '#F2DEDE', hc: Color.black }, nls.localize('inputValidationErrorBackground', "Input validation background color for error severity.")); +export const inputValidationErrorBorder = registerColor('inputValidation.errorBorder', { dark: '#BE1100', light: '#E51400', hc: '#BE1100' }, nls.localize('inputValidationErrorBorder', "Input validation border color for error severity.")); + +export const selectBackground = registerColor('dropdown.background', { dark: '#3C3C3C', light: Color.white, hc: Color.black }, nls.localize('dropdownBackground', "Dropdown background.")); +export const selectForeground = registerColor('dropdown.foreground', { dark: '#F0F0F0', light: null, hc: Color.white }, nls.localize('dropdownForeground', "Dropdown foreground.")); +export const selectBorder = registerColor('dropdown.border', { dark: selectBackground, light: '#CECECE', hc: contrastBorder }, nls.localize('dropdownBorder', "Dropdown border.")); + +export const listFocusBackground = registerColor('list.focusBackground', { dark: '#073655', light: '#DCEBFC', hc: null }, nls.localize('listFocusBackground', "List/Tree background color for the focused item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not.")); +export const listActiveSelectionBackground = registerColor('list.activeSelectionBackground', { dark: '#0E639C', light: '#4FA7FF', hc: null }, nls.localize('listActiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not.")); +export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not.")); +export const listActiveSelectionForeground = registerColor('list.activeSelectionForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not.")); +export const listFocusAndSelectionBackground = registerColor('list.focusAndSelectionBackground', { dark: '#094771', light: '#3399FF', hc: null }, nls.localize('listFocusAndSelectionBackground', "List/Tree background color for the focused and selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not. This color wins over the individual selection and focus colors.")); +export const listFocusAndSelectionForeground = registerColor('list.focusAndSelectionForeground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('listFocusAndSelectionForeground', "List/Tree foreground color for the focused and selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not. This color wins over the individual selection and focus colors.")); +export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse.")); +export const listDropBackground = registerColor('list.dropBackground', { dark: '#383B3D', light: '#DDECFF', hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse.")); +export const listHighlightForeground = registerColor('list.highlightForeground', { dark: '#219AE4', light: '#186B9E', hc: '#219AE4' }, nls.localize('highlight', 'List/Tree foreground color of the match highlights when searching inside the list/tree.')); + +export const pickerGroupForeground = registerColor('pickerGroup.foreground', { dark: Color.fromHex('#0097FB').transparent(0.6), light: Color.fromHex('#007ACC').transparent(0.6), hc: Color.white }, nls.localize('pickerGroupForeground', "Quick picker color for grouping labels.")); +export const pickerGroupBorder = registerColor('pickerGroup.border', { dark: '#3F3F46', light: '#CCCEDB', hc: Color.white }, nls.localize('pickerGroupBorder', "Quick picker color for grouping borders.")); + +export const buttonForeground = registerColor('button.foreground', { dark: Color.white, light: Color.white, hc: Color.white }, nls.localize('buttonForeground', "Button foreground color.")); +export const buttonBackground = registerColor('button.background', { dark: '#0E639C', light: '#007ACC', hc: null }, nls.localize('buttonBackground', "Button background color.")); +export const buttonHoverBackground = registerColor('button.hoverBackground', { dark: '#006BB3', light: '#006BB3', hc: null }, nls.localize('buttonHoverBackground', "Button background color when hovering.")); + +export const scrollbarShadow = registerColor('scrollbar.shadow', { dark: '#000000', light: '#DDDDDD', hc: null }, nls.localize('scrollbarShadow', "Scrollbar shadow to indicate that the view is scrolled.")); +export const scrollbarSliderBackground = registerColor('scrollbarSlider.background', { dark: Color.fromHex('#797979').transparent(0.4), light: Color.fromHex('#646464').transparent(0.4), hc: Color.fromHex(contrastBorder).transparent(0.6) }, nls.localize('scrollbarSliderBackground', "Slider background color.")); +export const scrollbarSliderHoverBackground = registerColor('scrollbarSlider.hoverBackground', { dark: Color.fromHex('#646464').transparent(0.7), light: Color.fromHex('#646464').transparent(0.7), hc: Color.fromHex(contrastBorder).transparent(0.8) }, nls.localize('scrollbarSliderHoverBackground', "Slider background color when hovering.")); +export const scrollbarSliderActiveBackground = registerColor('scrollbarSlider.activeBackground', { dark: Color.fromHex('#BFBFBF').transparent(0.4), light: Color.fromHex('#000000').transparent(0.6), hc: Color.fromHex(contrastBorder) }, nls.localize('scrollbarSliderActiveBackground', "Slider background color when active.")); /** * Editor background color. * Because of bug https://monacotools.visualstudio.com/DefaultCollection/Monaco/_workitems/edit/13254 * we are *not* using the color white (or #ffffff, rgba(255,255,255)) but something very close to white. */ -export const editorBackground = registerColor('editorBackground', { light: '#fffffe', dark: '#1E1E1E', hc: Color.black }, nls.localize('editorBackground', "Editor background color.")); +export const editorBackground = registerColor('editor.background', { light: '#fffffe', dark: '#1E1E1E', hc: Color.black }, nls.localize('editorBackground', "Editor background color.")); /** * Editor foreground color. */ -export const editorForeground = registerColor('editorForeground', { light: '#333333', dark: '#BBBBBB', hc: Color.white }, nls.localize('editorForeground', "Editor default foreground color.")); +export const editorForeground = registerColor('editor.foreground', { light: '#333333', dark: '#BBBBBB', hc: Color.white }, nls.localize('editorForeground', "Editor default foreground color.")); /** * Editor selection colors. */ -export const editorSelection = registerColor('editorSelection', { light: '#ADD6FF', dark: '#264F78', hc: '#f3f518' }, nls.localize('editorSelection', "Color of the editor selection.")); -export const editorInactiveSelection = registerColor('editorInactiveSelection', { light: transparent(editorSelection, 0.5), dark: transparent(editorSelection, 0.5), hc: null }, nls.localize('editorInactiveSelection', "Color of the selection in an inactive editor.")); -export const editorSelectionHighlight = registerColor('editorSelectionHighlight', { light: lessProminent(editorSelection, editorBackground, 0.3, 0.6), dark: lessProminent(editorSelection, editorBackground, 0.3, 0.6), hc: null }, nls.localize('editorSelectionHighlight', 'Color for regions with the same content as the selection.')); +export const editorSelection = registerColor('editor.selectionBackground', { light: '#ADD6FF', dark: '#264F78', hc: '#f3f518' }, nls.localize('editorSelection', "Color of the editor selection.")); +export const editorInactiveSelection = registerColor('editor.inactiveSelectionBackground', { light: transparent(editorSelection, 0.5), dark: transparent(editorSelection, 0.5), hc: null }, nls.localize('editorInactiveSelection', "Color of the selection in an inactive editor.")); +export const editorSelectionHighlight = registerColor('editor.selectionHighlightBackground', { light: lessProminent(editorSelection, editorBackground, 0.3, 0.6), dark: lessProminent(editorSelection, editorBackground, 0.3, 0.6), hc: null }, nls.localize('editorSelectionHighlight', 'Color for regions with the same content as the selection.')); /** * Editor find match colors. */ -export const editorFindMatch = registerColor('editorFindMatch', { light: '#A8AC94', dark: '#515C6A', hc: null }, nls.localize('editorFindMatch', "Color of the current search match.")); -export const editorFindMatchHighlight = registerColor('editorFindMatchHighlight', { light: '#EA5C0055', dark: '#EA5C0055', hc: null }, nls.localize('findMatchHighlight', "Color of the other search matches.")); -export const editorFindRangeHighlight = registerColor('editorFindRangeHighlight', { dark: '#3a3d4166', light: '#b4b4b44d', hc: null }, nls.localize('findRangeHighlight', "Color the range limiting the search.")); +export const editorFindMatch = registerColor('editor.findMatchBackground', { light: '#A8AC94', dark: '#515C6A', hc: null }, nls.localize('editorFindMatch', "Color of the current search match.")); +export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground', { light: '#EA5C0055', dark: '#EA5C0055', hc: null }, nls.localize('findMatchHighlight', "Color of the other search matches.")); +export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground', { dark: '#3a3d4166', light: '#b4b4b44d', hc: null }, nls.localize('findRangeHighlight', "Color the range limiting the search.")); /** * Editor link colors */ -export const editorActiveLinkForeground = registerColor('editorActiveLinkForeground', { dark: '#4E94CE', light: Color.black, hc: Color.cyan }, nls.localize('activeLinkForeground', 'Color of active links.')); -export const editorLinkForeground = registerColor('editorLinkForeground', { dark: null, light: null, hc: null }, nls.localize('linkForeground', 'Color of links.')); +export const editorActiveLinkForeground = registerColor('editorLink.activeForeground', { dark: '#4E94CE', light: Color.black, hc: Color.cyan }, nls.localize('activeLinkForeground', 'Color of active links.')); +export const editorLinkForeground = registerColor('editorLink.foreground', { dark: null, light: null, hc: null }, nls.localize('linkForeground', 'Color of links.')); /** * Find widget */ -export const editorWidgetBackground = registerColor('editorWidgetBackground', { dark: '#2D2D30', light: '#EFEFF2', hc: '#0C141F' }, nls.localize('editorWidgetBackground', 'Background color of editor widgets, such as find/replace.')); +export const editorWidgetBackground = registerColor('editorWidget.background', { dark: '#2D2D30', light: '#EFEFF2', hc: '#0C141F' }, nls.localize('editorWidgetBackground', 'Background color of editor widgets, such as find/replace.')); // ----- color functions diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index 53c4747a8f6d1ac1069c14d25764002e6cfe8e87..389e76cdbac35d17c89bf2574ea42ecfc2895495 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.ts @@ -11,49 +11,49 @@ import { Color, RGBA } from 'vs/base/common/color'; // < --- Tabs --- > -export const TABS_CONTAINER_BACKGROUND = registerColor('tabsContainerBackground', { +export const TABS_CONTAINER_BACKGROUND = registerColor('editorGroupHeader.tabsBackground', { dark: '#252526', light: '#F3F3F3', hc: null }, nls.localize('tabsContainerBackground', "Background color of the tabs container. 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_BACKGROUND = registerColor('tabActiveBackground', { +export const TAB_ACTIVE_BACKGROUND = registerColor('tab.activeBackground', { dark: editorBackground, light: editorBackground, hc: editorBackground }, nls.localize('tabActiveBackground', "Active 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_INACTIVE_BACKGROUND = registerColor('tabInactiveBackground', { +export const TAB_INACTIVE_BACKGROUND = registerColor('tab.inactiveBackground', { dark: '#2D2D2D', light: '#ECECEC', 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_BORDER = registerColor('tabBorder', { +export const TAB_BORDER = registerColor('tab.border', { dark: '#252526', light: '#F3F3F3', hc: contrastBorder }, nls.localize('tabBorder', "Border to separate tabs from each other. 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_GROUP_ACTIVE_FOREGROUND = registerColor('tabActiveEditorGroupActiveForeground', { +export const TAB_ACTIVE_GROUP_ACTIVE_FOREGROUND = registerColor('tab.activeForeground', { dark: Color.white, light: Color.fromRGBA(new RGBA(51, 51, 51)), hc: Color.white }, nls.localize('tabActiveEditorGroupActiveForeground', "Active 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.")); -export const TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tabActiveEditorGroupInactiveForeground', { +export const TAB_ACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tab.activeWithInactiveEditorGroupForeground', { dark: Color.white.transparent(0.5), light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.7), hc: Color.white }, nls.localize('tabActiveEditorGroupInactiveForeground', "Active tab foreground color in an inactive 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_GROUP_ACTIVE_FOREGROUND = registerColor('tabInactiveEditorGroupActiveForeground', { +export const TAB_INACTIVE_GROUP_ACTIVE_FOREGROUND = registerColor('tab.inactiveForeground', { dark: Color.white.transparent(0.5), light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.5), hc: Color.white }, nls.localize('tabInactiveEditorGroupActiveForeground', "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.")); -export const TAB_INACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tabInactiveEditorGroupInactiveForeground', { +export const TAB_INACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tab.inactiveWithInactiveEditorGroupForeground', { dark: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.5).transparent(0.5), light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.5).transparent(0.7), hc: Color.white @@ -63,31 +63,31 @@ export const TAB_INACTIVE_GROUP_INACTIVE_FOREGROUND = registerColor('tabInactive // < --- Editors --- > -export const EDITOR_GROUP_BACKGROUND = registerColor('editorGroupBackground', { +export const EDITOR_GROUP_BACKGROUND = registerColor('editorGroup.background', { dark: '#2D2D2D', light: '#ECECEC', hc: null }, nls.localize('editorGroupBackground', "Background color of an editor group. Editor groups are the containers of editors. The background color shows up when dragging editor groups around.")); -export const EDITOR_GROUP_HEADER_BACKGROUND = registerColor('editorGroupHeaderBackground', { +export const EDITOR_GROUP_HEADER_BACKGROUND = registerColor('editorGroupHeader.noTabsBackground', { 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.")); -export const EDITOR_GROUP_BORDER_COLOR = registerColor('editorGroupBorder', { +export const EDITOR_GROUP_BORDER_COLOR = registerColor('editorGroup.border', { dark: '#444444', light: '#E7E7E7', hc: contrastBorder }, nls.localize('editorGroupBorder', "Color to separate multiple editor groups from each other. Editor groups are the containers of editors.")); -export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorDragAndDropBackground', { +export const EDITOR_DRAG_AND_DROP_BACKGROUND = registerColor('editorGroup.dropBackground', { dark: Color.fromRGBA(new RGBA(83, 89, 93)).transparent(0.5), light: Color.fromRGBA(new RGBA(51, 153, 255)).transparent(0.18), hc: null }, nls.localize('editorDragAndDropBackground', "Background color when dragging editors around.")); -export const EDITOR_MASTER_DETAILS_BORDER = registerColor('editorMasterDetailsBorder', { +export const EDITOR_MASTER_DETAILS_BORDER = registerColor('masterDetailsEditor.border', { dark: '#000000', light: '#DDDDDD', hc: null @@ -96,31 +96,31 @@ export const EDITOR_MASTER_DETAILS_BORDER = registerColor('editorMasterDetailsBo // < --- Panels --- > -export const PANEL_BACKGROUND = registerColor('panelBackground', { +export const PANEL_BACKGROUND = registerColor('panel.background', { dark: editorBackground, light: editorBackground, hc: editorBackground }, nls.localize('panelBackground', "Panel background color. Panels are shown below the editor area and contain views like output and integrated terminal.")); -export const PANEL_BORDER_COLOR = registerColor('panelBorder', { +export const PANEL_BORDER_COLOR = registerColor('panel.border', { dark: Color.fromRGBA(new RGBA(128, 128, 128)).transparent(0.35), light: Color.fromRGBA(new RGBA(128, 128, 128)).transparent(0.35), hc: contrastBorder }, nls.localize('panelBorder', "Panel border color on the top separating to the editor. Panels are shown below the editor area and contain views like output and integrated terminal.")); -export const PANEL_ACTIVE_TITLE_COLOR = registerColor('panelActiveTitleForeground', { +export const PANEL_ACTIVE_TITLE_COLOR = registerColor('panelTitle.activeForeground', { dark: '#E7E7E7', light: '#424242', hc: Color.white }, nls.localize('panelActiveTitleForeground', "Title color for the active panel. Panels are shown below the editor area and contain views like output and integrated terminal.")); -export const PANEL_INACTIVE_TITLE_COLOR = registerColor('panelInactiveTitleForeground', { +export const PANEL_INACTIVE_TITLE_COLOR = registerColor('panelTitle.inactiveForeground', { dark: Color.fromRGBA(new RGBA(231, 231, 231)).transparent(0.5), light: Color.fromRGBA(new RGBA(66, 66, 66)).transparent(0.75), hc: Color.white }, nls.localize('panelInactiveTitleForeground', "Title color for the inactive panel. Panels are shown below the editor area and contain views like output and integrated terminal.")); -export const PANEL_ACTIVE_TITLE_BORDER = registerColor('panelActiveTitleBorder', { +export const PANEL_ACTIVE_TITLE_BORDER = registerColor('panelTitle.activeBorder', { dark: PANEL_BORDER_COLOR, light: PANEL_BORDER_COLOR, hc: contrastBorder @@ -130,43 +130,43 @@ export const PANEL_ACTIVE_TITLE_BORDER = registerColor('panelActiveTitleBorder', // < --- Status --- > -export const STATUS_BAR_FOREGROUND = registerColor('statusBarForeground', { +export const STATUS_BAR_FOREGROUND = registerColor('statusBar.foreground', { dark: '#FFFFFF', light: '#FFFFFF', hc: '#FFFFFF' }, nls.localize('statusBarForeground', "Status bar foreground color. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_BACKGROUND = registerColor('statusBarBackground', { +export const STATUS_BAR_BACKGROUND = registerColor('statusBar.background', { dark: '#007ACC', light: '#007ACC', hc: null }, nls.localize('statusBarBackground', "Standard status bar background color. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_NO_FOLDER_BACKGROUND = registerColor('statusBarNoFolderBackground', { +export const STATUS_BAR_NO_FOLDER_BACKGROUND = registerColor('statusBar.noFolderBackground', { dark: '#68217A', light: '#68217A', hc: null }, nls.localize('statusBarNoFolderBackground', "Status bar background color when no folder is opened. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_ITEM_ACTIVE_BACKGROUND = registerColor('statusBarItemActiveBackground', { +export const STATUS_BAR_ITEM_ACTIVE_BACKGROUND = registerColor('statusBarItem.activeBackground', { dark: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.18), light: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.18), hc: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.18) }, nls.localize('statusBarItemActiveBackground', "Status bar item background color when clicking. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItemHoverBackground', { +export const STATUS_BAR_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.hoverBackground', { dark: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12), light: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12), hc: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12) }, nls.localize('statusBarItemHoverBackground', "Status bar item background color when hovering. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarProminentItemBackground', { +export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarItem.prominentBackground', { 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.")); -export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarProminentItemHoverBackground', { +export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.prominentHoverBackground', { dark: '#369432', light: '#369432', hc: '#369432' @@ -176,31 +176,31 @@ export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusB // < --- Activity Bar --- > -export const ACTIVITY_BAR_BACKGROUND = registerColor('activityBarBackground', { +export const ACTIVITY_BAR_BACKGROUND = registerColor('activityBar.background', { dark: '#333333', light: '#2C2C2C', hc: '#000000' }, nls.localize('activityBarBackground', "Activity bar 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_BAR_FOREGROUND = registerColor('activityBarForeground', { +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.")); -export const ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND = registerColor('activityBarDragAndDropBackground', { +export const ACTIVITY_BAR_DRAG_AND_DROP_BACKGROUND = registerColor('activityBar.dropBackground', { dark: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12), light: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12), hc: Color.fromRGBA(new RGBA(255, 255, 255)).transparent(0.12), }, 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_BAR_BADGE_BACKGROUND = registerColor('activityBarBadgeBackground', { +export const ACTIVITY_BAR_BADGE_BACKGROUND = registerColor('activityBarBadge.background', { dark: '#007ACC', light: '#007ACC', hc: '#000000' }, 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_BAR_BADGE_FOREGROUND = registerColor('activityBarBadgeForeground', { +export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadge.foreground', { dark: Color.white, light: Color.white, hc: Color.white @@ -210,19 +210,19 @@ export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadgeFore // < --- Side Bar --- > -export const SIDE_BAR_BACKGROUND = registerColor('sideBarBackground', { +export const SIDE_BAR_BACKGROUND = registerColor('sideBar.background', { dark: '#252526', light: '#F3F3F3', hc: '#000000' }, nls.localize('sideBarBackground', "Side bar background color. The side bar is the container for views like explorer and search.")); -export const SIDE_BAR_TITLE_FOREGROUND = registerColor('sideBarTitleForeground', { +export const SIDE_BAR_TITLE_FOREGROUND = registerColor('sideBarTitle.foreground', { dark: '#BBBBBB', light: '#6f6f6f', hc: '#FFFFFF' }, nls.localize('sideBarTitleForeground', "Side bar title foreground color. The side bar is the container for views like explorer and search.")); -export const SIDE_BAR_SECTION_HEADER_BACKGROUND = registerColor('sideBarSectionHeaderBackground', { +export const SIDE_BAR_SECTION_HEADER_BACKGROUND = registerColor('sideBarSectionHeader.background', { dark: Color.fromHex('#808080').transparent(0.2), light: Color.fromHex('#808080').transparent(0.2), hc: null @@ -232,25 +232,25 @@ export const SIDE_BAR_SECTION_HEADER_BACKGROUND = registerColor('sideBarSectionH // < --- Title Bar --- > -export const TITLE_BAR_ACTIVE_FOREGROUND = registerColor('titleBarActiveForeground', { +export const TITLE_BAR_ACTIVE_FOREGROUND = registerColor('titleBar.activeForeground', { dark: '#CCCCCC', light: '#333333', hc: '#FFFFFF' }, nls.localize('titleBarActiveForeground', "Title bar foreground when the window is active. Note that this color is currently only supported on macOS.")); -export const TITLE_BAR_INACTIVE_FOREGROUND = registerColor('titleBarInactiveForeground', { +export const TITLE_BAR_INACTIVE_FOREGROUND = registerColor('titleBar.inactiveForeground', { dark: Color.fromRGBA(new RGBA(204, 204, 204)).transparent(0.6), light: Color.fromRGBA(new RGBA(51, 51, 51)).transparent(0.6), hc: null }, nls.localize('titleBarInactiveForeground', "Title bar foreground when the window is inactive. Note that this color is currently only supported on macOS.")); -export const TITLE_BAR_ACTIVE_BACKGROUND = registerColor('titleBarActiveBackground', { +export const TITLE_BAR_ACTIVE_BACKGROUND = registerColor('titleBar.activeBackground', { dark: '#3C3C3C', light: '#DDDDDD', hc: '#000000' }, nls.localize('titleBarActiveBackground', "Title bar background when the window is active. Note that this color is currently only supported on macOS.")); -export const TITLE_BAR_INACTIVE_BACKGROUND = registerColor('titleBarInactiveBackground', { +export const TITLE_BAR_INACTIVE_BACKGROUND = registerColor('titleBar.inactiveBackground', { dark: Color.fromRGBA(new RGBA(60, 60, 60)).transparent(0.6), light: Color.fromRGBA(new RGBA(221, 221, 221)).transparent(0.6), hc: null @@ -258,13 +258,13 @@ export const TITLE_BAR_INACTIVE_BACKGROUND = registerColor('titleBarInactiveBack // < --- Notifications --- > -export const NOTIFICATIONS_FOREGROUND = registerColor('notificationsForeground', { +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('notificationsBackground', { +export const NOTIFICATIONS_BACKGROUND = registerColor('notification.background', { dark: '#333333', light: '#2C2C2C', hc: '#000000' diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts index 18a2e751a61f5f821adaf6a1d6f677f655d06395..2287c14feb2936416f970ee0100aec9240d5caaa 100644 --- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts +++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts @@ -34,7 +34,7 @@ import { localize } from 'vs/nls'; const $ = builder.$; const DEBUG_ACTIONS_WIDGET_POSITION_KEY = 'debug.actionswidgetposition'; -export const debugToolBarBackground = registerColor('debugToolBarBackground', { +export const debugToolBarBackground = registerColor('debugToolBar.background', { dark: '#333333', light: '#F3F3F3', hc: '#000000' diff --git a/src/vs/workbench/parts/debug/browser/exceptionWidget.ts b/src/vs/workbench/parts/debug/browser/exceptionWidget.ts index d4e280e232b043feb106723b254b546ce35e6d04..805cc62a57d09a119ddde555bdf6a6f262111bca 100644 --- a/src/vs/workbench/parts/debug/browser/exceptionWidget.ts +++ b/src/vs/workbench/parts/debug/browser/exceptionWidget.ts @@ -18,8 +18,8 @@ const $ = dom.$; // theming -export const debugExceptionWidgetBorder = registerColor('debugExceptionWidgetBorder', { dark: '#a31515', light: '#a31515', hc: '#a31515' }, nls.localize('debugExceptionWidgetBorder', 'Exception widget border color.')); -export const debugExceptionWidgetBackground = registerColor('debugExceptionWidgetBackground', { dark: '#a3151540', light: '#a315150d', hc: '#a3151573' }, nls.localize('debugExceptionWidgetBackground', 'Exception widget background color.')); +export const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', { dark: '#a31515', light: '#a31515', hc: '#a31515' }, nls.localize('debugExceptionWidgetBorder', 'Exception widget border color.')); +export const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#a3151540', light: '#a315150d', hc: '#a3151573' }, nls.localize('debugExceptionWidgetBackground', 'Exception widget background color.')); export class ExceptionWidget extends ZoneWidget { diff --git a/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.ts b/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.ts index e96198336b061f38fe78acf0f6b68d40e3fcce17..ff87ebc629e907c89b0c777cdcfa063a745bdb55 100644 --- a/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.ts +++ b/src/vs/workbench/parts/debug/electron-browser/statusbarColorProvider.ts @@ -14,7 +14,7 @@ import { STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_BACKGROUND, Themable } from // colors for theming -export const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBarDebuggingBackground', { +export const STATUS_BAR_DEBUGGING_BACKGROUND = registerColor('statusBar.debuggingBackground', { dark: '#CC6633', light: '#CC6633', hc: '#CC6633' diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts index 09f2bc7aaa2c61912a630695aaa7586f011a53fa..16d29e6bf4bf47f01f5d34e778369a598f2ba1d1 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts @@ -14,7 +14,7 @@ import { registerColor, ColorIdentifier } from 'vs/platform/theme/common/colorRe export const ansiColorIdentifiers: ColorIdentifier[] = []; const ansiColorMap = { - terminalAnsiBlack: { + 'terminal.ansiBlack': { index: 0, defaults: { light: '#000000', @@ -22,7 +22,7 @@ const ansiColorMap = { hc: '#000000' } }, - terminalAnsiRed: { + 'terminal.ansiRed': { index: 1, defaults: { light: '#cd3131', @@ -30,7 +30,7 @@ const ansiColorMap = { hc: '#cd0000' } }, - terminalAnsiGreen: { + 'terminal.ansiGreen': { index: 2, defaults: { light: '#00BC00', @@ -38,7 +38,7 @@ const ansiColorMap = { hc: '#00cd00' } }, - terminalAnsiYellow: { + 'terminal.ansiYellow': { index: 3, defaults: { light: '#949800', @@ -46,7 +46,7 @@ const ansiColorMap = { hc: '#cdcd00' } }, - terminalAnsiBlue: { + 'terminal.ansiBlue': { index: 4, defaults: { light: '#0451a5', @@ -54,7 +54,7 @@ const ansiColorMap = { hc: '#0000ee' } }, - terminalAnsiMagenta: { + 'terminal.ansiMagenta': { index: 5, defaults: { light: '#bc05bc', @@ -62,7 +62,7 @@ const ansiColorMap = { hc: '#cd00cd' } }, - terminalAnsiCyan: { + 'terminal.ansiCyan': { index: 6, defaults: { light: '#0598bc', @@ -70,7 +70,7 @@ const ansiColorMap = { hc: '#00cdcd' } }, - terminalAnsiWhite: { + 'terminal.ansiWhite': { index: 7, defaults: { light: '#555555', @@ -78,7 +78,7 @@ const ansiColorMap = { hc: '#e5e5e5' } }, - terminalAnsiBrightBlack: { + 'terminal.ansiBrightBlack': { index: 8, defaults: { light: '#666666', @@ -86,7 +86,7 @@ const ansiColorMap = { hc: '#7f7f7f' } }, - terminalAnsiBrightRed: { + 'terminal.ansiBrightRed': { index: 9, defaults: { light: '#cd3131', @@ -94,7 +94,7 @@ const ansiColorMap = { hc: '#ff0000' } }, - terminalAnsiBrightGreen: { + 'terminal.ansiBrightGreen': { index: 10, defaults: { light: '#14CE14', @@ -102,7 +102,7 @@ const ansiColorMap = { hc: '#00ff00' } }, - terminalAnsiBrightYellow: { + 'terminal.ansiBrightYellow': { index: 11, defaults: { light: '#b5ba00', @@ -110,7 +110,7 @@ const ansiColorMap = { hc: '#ffff00' } }, - terminalAnsiBrightBlue: { + 'terminal.ansiBrightBlue': { index: 12, defaults: { light: '#0451a5', @@ -118,7 +118,7 @@ const ansiColorMap = { hc: '#5c5cff' } }, - terminalAnsiBrightMagenta: { + 'terminal.ansiBrightMagenta': { index: 13, defaults: { light: '#bc05bc', @@ -126,7 +126,7 @@ const ansiColorMap = { hc: '#ff00ff' } }, - terminalAnsiBrightCyan: { + 'terminal.ansiBrightCyan': { index: 14, defaults: { light: '#0598bc', @@ -134,7 +134,7 @@ const ansiColorMap = { hc: '#00ffff' } }, - terminalAnsiBrightWhite: { + 'terminal.ansiBrightWhite': { index: 15, defaults: { light: '#a5a5a5',