From 9042de0b3aa78d35f89dc12864a08cbe903415e3 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Tue, 31 Oct 2023 18:41:31 -0700 Subject: [PATCH 1/4] fix: restore Dark Modern preformat foreground --- extensions/theme-defaults/themes/dark_modern.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json index cdb5c1f5f8f95..9fdc795bb34ef 100644 --- a/extensions/theme-defaults/themes/dark_modern.json +++ b/extensions/theme-defaults/themes/dark_modern.json @@ -113,7 +113,7 @@ "textCodeBlock.background": "#2B2B2B", "textLink.activeForeground": "#4daafc", "textLink.foreground": "#4daafc", - "textPreformat.foreground": "#D0D0D0", + "textPreformat.foreground": "#D7BA7D", "textPreformat.background": "#3C3C3C", "textSeparator.foreground": "#21262D", "titleBar.activeBackground": "#181818", From 0b0f36da9213b637d95cdc041ab7824900da3740 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Tue, 31 Oct 2023 18:55:30 -0700 Subject: [PATCH 2/4] fix: also revert for Light Modern --- extensions/theme-defaults/themes/light_modern.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json index a89defee38598..e70421d55cba1 100644 --- a/extensions/theme-defaults/themes/light_modern.json +++ b/extensions/theme-defaults/themes/light_modern.json @@ -131,7 +131,7 @@ "textCodeBlock.background": "#F8F8F8", "textLink.activeForeground": "#005FB8", "textLink.foreground": "#005FB8", - "textPreformat.foreground": "#3B3B3B", + "textPreformat.foreground": "#A31515", "textPreformat.background": "#0000001F", "textSeparator.foreground": "#21262D", "titleBar.activeBackground": "#F8F8F8", From 1ccbfc55986c74636134c4acc1da6232d4ff2129 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Tue, 31 Oct 2023 20:30:15 -0700 Subject: [PATCH 3/4] fix: revert text preformat HC colors The real fix is to update index.html to use the new preformat-background colors, but that's a larger change than we should take for endgame, so this commit just reverts to the previous colors we had for the release --- src/vs/platform/theme/common/colorRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts index 6f83635a14842..064ae15f2d57a 100644 --- a/src/vs/platform/theme/common/colorRegistry.ts +++ b/src/vs/platform/theme/common/colorRegistry.ts @@ -227,7 +227,7 @@ export const selectionBackground = registerColor('selection.background', { light export const textSeparatorForeground = registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hcDark: Color.black, hcLight: '#292929' }, nls.localize('textSeparatorForeground', "Color for text separators.")); export const textLinkForeground = registerColor('textLink.foreground', { light: '#006AB1', dark: '#3794FF', hcDark: '#3794FF', hcLight: '#0F4A85' }, nls.localize('textLinkForeground', "Foreground color for links in text.")); export const textLinkActiveForeground = registerColor('textLink.activeForeground', { light: '#006AB1', dark: '#3794FF', hcDark: '#3794FF', hcLight: '#0F4A85' }, nls.localize('textLinkActiveForeground', "Foreground color for links in text when clicked on and on mouse hover.")); -export const textPreformatForeground = registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, nls.localize('textPreformatForeground', "Foreground color for preformatted text segments.")); +export const textPreformatForeground = registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#D7BA7D', hcLight: '#292929' }, nls.localize('textPreformatForeground', "Foreground color for preformatted text segments.")); export const textPreformatBackground = registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, nls.localize('textPreformatBackground', "Background color for preformatted text segments.")); export const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, nls.localize('textBlockQuoteBackground', "Background color for block quotes in text.")); export const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, nls.localize('textBlockQuoteBorder', "Border color for block quotes in text.")); From 81836ab92a1f908a86e87e212031b3df27917a76 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Tue, 31 Oct 2023 20:56:06 -0700 Subject: [PATCH 4/4] fix: make preformat in HC chat/settings legible --- src/vs/workbench/contrib/chat/browser/media/chat.css | 1 - .../contrib/preferences/browser/media/settingsEditor2.css | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css index 057ad81514644..ec614f64a4e37 100644 --- a/src/vs/workbench/contrib/chat/browser/media/chat.css +++ b/src/vs/workbench/contrib/chat/browser/media/chat.css @@ -244,7 +244,6 @@ font-family: var(--monaco-monospace-font); font-size: 12px; color: var(--vscode-textPreformat-foreground); - background-color: var(--vscode-textPreformat-background); padding: 1px 3px; border-radius: 4px; } diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css index a2bfc42d085e5..174475d5779a7 100644 --- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css +++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css @@ -533,7 +533,6 @@ font-family: var(--monaco-monospace-font); font-size: 11px; color: var(--vscode-textPreformat-foreground); - background-color: var(--vscode-textPreformat-background); padding: 1px 3px; border-radius: 4px; } @@ -604,7 +603,6 @@ font-family: var(--monaco-monospace-font); font-size: 12px; color: var(--vscode-textPreformat-foreground); - background-color: var(--vscode-textPreformat-background); padding: 2px 5px; border-radius: 4px; }