Skip to content

Commit 651b5dc

Browse files
committed
Merge branch 'main' into merogge/code-block-help
2 parents 4840557 + a23baed commit 651b5dc

File tree

124 files changed

+35210
-35039
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+35210
-35039
lines changed

build/lib/stylelint/vscode-known-variables.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,8 @@
692692
"--tab-border-top-color",
693693
"--tab-dirty-border-top-color",
694694
"--tabs-border-bottom-color",
695+
"--tab-sizing-current-width",
696+
"--tab-sizing-fixed-max-width",
695697
"--testMessageDecorationFontFamily",
696698
"--testMessageDecorationFontSize",
697699
"--title-border-bottom-color",

extensions/theme-defaults/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
},
2222
{
2323
"id": "Default Dark Modern",
24-
"label": "%darkPlusExperimentalColorThemeLabel%",
24+
"label": "%darkModernThemeLabel%",
2525
"uiTheme": "vs-dark",
26-
"path": "./themes/dark_plus_experimental.json"
26+
"path": "./themes/dark_modern.json"
2727
},
2828
{
2929
"id": "Default Light+",
@@ -33,9 +33,9 @@
3333
},
3434
{
3535
"id": "Default Light Modern",
36-
"label": "%lightPlusExperimentalColorThemeLabel%",
36+
"label": "%lightModernThemeLabel%",
3737
"uiTheme": "vs",
38-
"path": "./themes/light_plus_experimental.json"
38+
"path": "./themes/light_modern.json"
3939
},
4040
{
4141
"id": "Visual Studio Dark",

extensions/theme-defaults/package.nls.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"displayName": "Default Themes",
33
"description": "The default Visual Studio light and dark themes",
44
"darkPlusColorThemeLabel": "Dark+",
5-
"darkPlusExperimentalColorThemeLabel": "Dark Modern",
5+
"darkModernThemeLabel": "Dark Modern",
66
"lightPlusColorThemeLabel": "Light+",
7-
"lightPlusExperimentalColorThemeLabel": "Light Modern",
7+
"lightModernThemeLabel": "Light Modern",
88
"darkColorThemeLabel": "Dark (Visual Studio)",
99
"lightColorThemeLabel": "Light (Visual Studio)",
1010
"hcColorThemeLabel": "Dark High Contrast",

extensions/theme-defaults/themes/light_plus_experimental.json renamed to extensions/theme-defaults/themes/light_modern.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"terminal.tab.activeBorder": "#005fb8",
138138
"textBlockQuote.background": "#f8f8f8",
139139
"textBlockQuote.border": "#0000001a",
140-
"textCodeBlock.background": "#6e768166",
140+
"textCodeBlock.background": "#f2f2f2",
141141
"textLink.activeForeground": "#005FB8",
142142
"textLink.foreground": "#005FB8",
143143
"textSeparator.foreground": "#21262d",

0 commit comments

Comments
 (0)