Skip to content

Commit

Permalink
merge theme rules for css/less/scss variables (#197657)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aeschli
aeschli authored Nov 17, 2023
1 parent edc4698 commit cc08867
Show file tree
Hide file tree
Showing 10 changed files with 1,548 additions and 1,556 deletions.
4 changes: 1 addition & 3 deletions extensions/theme-defaults/themes/dark_vs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,7 @@
"scope": [
"support.type.vendored.property-name",
"support.type.property-name",
"variable.css",
"variable.scss",
"source.css.less variable.other",
"source.css variable",
"source.coffee.embedded"
],
"settings": {
Expand Down
4 changes: 1 addition & 3 deletions extensions/theme-defaults/themes/hc_black.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,7 @@
"scope": [
"support.type.vendored.property-name",
"support.type.property-name",
"variable.css",
"variable.scss",
"source.css.less variable.other",
"source.css variable",
"source.coffee.embedded"
],
"settings": {
Expand Down
4 changes: 1 addition & 3 deletions extensions/theme-defaults/themes/hc_light.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,7 @@
"scope": [
"support.type.vendored.property-name",
"support.type.property-name",
"variable.css",
"variable.scss",
"source.css.less variable.other",
"source.css variable",
"source.coffee.embedded"
],
"settings": {
Expand Down
4 changes: 1 addition & 3 deletions extensions/theme-defaults/themes/light_vs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,7 @@
"scope": [
"support.type.vendored.property-name",
"support.type.property-name",
"variable.css",
"variable.scss",
"source.css.less variable.other",
"source.css variable",
"source.coffee.embedded"
],
"settings": {
Expand Down
32 changes: 16 additions & 16 deletions extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,28 @@
"c": "@",
"t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less",
"r": {
"dark_plus": "source.css.less variable.other: #9CDCFE",
"light_plus": "source.css.less variable.other: #E50000",
"dark_vs": "source.css.less variable.other: #9CDCFE",
"light_vs": "source.css.less variable.other: #E50000",
"hc_black": "source.css.less variable.other: #D4D4D4",
"dark_modern": "source.css.less variable.other: #9CDCFE",
"hc_light": "source.css.less variable.other: #264F78",
"light_modern": "source.css.less variable.other: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
"c": "hm",
"t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less",
"r": {
"dark_plus": "source.css.less variable.other: #9CDCFE",
"light_plus": "source.css.less variable.other: #E50000",
"dark_vs": "source.css.less variable.other: #9CDCFE",
"light_vs": "source.css.less variable.other: #E50000",
"hc_black": "source.css.less variable.other: #D4D4D4",
"dark_modern": "source.css.less variable.other: #9CDCFE",
"hc_light": "source.css.less variable.other: #264F78",
"light_modern": "source.css.less variable.other: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down
64 changes: 32 additions & 32 deletions extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
"c": "--spacing-unit",
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
"light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
"light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"dark_modern": "variable.scss: #9CDCFE",
"hc_light": "variable.scss: #264F78",
"light_modern": "variable.scss: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -171,14 +171,14 @@
"c": "--cell-padding",
"t": "source.css.scss meta.property-list.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
"light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
"light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"dark_modern": "variable.scss: #9CDCFE",
"hc_light": "variable.scss: #264F78",
"light_modern": "variable.scss: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -311,14 +311,14 @@
"c": "--spacing-unit",
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
"light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
"light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"dark_modern": "variable.scss: #9CDCFE",
"hc_light": "variable.scss: #264F78",
"light_modern": "variable.scss: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -591,14 +591,14 @@
"c": "--spacing-unit",
"t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss",
"r": {
"dark_plus": "variable.scss: #9CDCFE",
"light_plus": "variable.scss: #E50000",
"dark_vs": "variable.scss: #9CDCFE",
"light_vs": "variable.scss: #E50000",
"hc_black": "variable.scss: #D4D4D4",
"dark_modern": "variable.scss: #9CDCFE",
"hc_light": "variable.scss: #264F78",
"light_modern": "variable.scss: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down
64 changes: 32 additions & 32 deletions extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
"c": "--spacing-unit",
"t": "source.css meta.property-list.css variable.css",
"r": {
"dark_plus": "variable.css: #9CDCFE",
"light_plus": "variable.css: #E50000",
"dark_vs": "variable.css: #9CDCFE",
"light_vs": "variable.css: #E50000",
"hc_black": "variable.css: #D4D4D4",
"dark_modern": "variable.css: #9CDCFE",
"hc_light": "variable.css: #264F78",
"light_modern": "variable.css: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -171,14 +171,14 @@
"c": "--cell-padding",
"t": "source.css meta.property-list.css variable.css",
"r": {
"dark_plus": "variable.css: #9CDCFE",
"light_plus": "variable.css: #E50000",
"dark_vs": "variable.css: #9CDCFE",
"light_vs": "variable.css: #E50000",
"hc_black": "variable.css: #D4D4D4",
"dark_modern": "variable.css: #9CDCFE",
"hc_light": "variable.css: #264F78",
"light_modern": "variable.css: #E50000"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -283,14 +283,14 @@
"c": "--spacing-unit",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.variable.css variable.argument.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -563,14 +563,14 @@
"c": "--spacing-unit",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.calc.css meta.function.variable.css variable.argument.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down
80 changes: 40 additions & 40 deletions extensions/vscode-colorize-tests/test/colorize-results/test_css.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1501,14 +1501,14 @@
"c": "blossoms.jpg",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -5071,14 +5071,14 @@
"c": "zen-bg.jpg",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -6023,14 +6023,14 @@
"c": "h1.gif",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -9929,14 +9929,14 @@
"c": "paper-bg.jpg",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down Expand Up @@ -11049,14 +11049,14 @@
"c": "cr2.gif",
"t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "variable: #9CDCFE",
"dark_modern": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_modern": "variable: #001080"
"dark_plus": "source.css variable: #9CDCFE",
"light_plus": "source.css variable: #E50000",
"dark_vs": "source.css variable: #9CDCFE",
"light_vs": "source.css variable: #E50000",
"hc_black": "source.css variable: #D4D4D4",
"dark_modern": "source.css variable: #9CDCFE",
"hc_light": "source.css variable: #264F78",
"light_modern": "source.css variable: #E50000"
}
},
{
Expand Down
Loading

0 comments on commit cc08867

Please sign in to comment.