Skip to content

Commit

Permalink
fix(theme): update custom themes to match latest vscode 1.7.1 themes, r…
Browse files Browse the repository at this point in the history
…esolves: #20
  • Loading branch information
erik-lieben committed Nov 5, 2016
1 parent 902c948 commit e5741f7
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 66 deletions.
46 changes: 35 additions & 11 deletions themes/dark_plus.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@
"name": "Dark+",
"include": "./dark_vs.json",
"settings": [
{
"name": "Function declarations",
"scope": [
"entity.name.function",
"support.function"
],
"settings": {
"foreground": "#DCDCAA"
}
},
{
"name": "Types declaration and references",
"scope": [
"meta.type.name",
"meta.return.type",
"meta.return-type",
"meta.cast",
"meta.type.annotation",
"support.class",
"support.type",
"entity.name.class",
"entity.name.type",
"storage.type.cs",
"storage.type.java"
Expand All @@ -21,13 +27,17 @@
}
},
{
"name": "Function declarations",
"name": "Types declaration and references, TS grammar specific",
"scope": [
"entity.name.function",
"entity.name.method"
"meta.return.type",
"meta.type.cast.expr",
"meta.type.new.expr",
"support.constant.math",
"support.constant.dom",
"support.constant.json"
],
"settings": {
"foreground": "#DCDCAA"
"foreground": "#4EC9B0"
}
},
{
Expand All @@ -40,15 +50,22 @@
{
"name": "Variable and parameter name",
"scope": [
"meta.parameter.type.variable",
"variable.parameter",
"variable",
"variable.name"
"variable.name",
"support.variable"
],
"settings": {
"foreground": "#9CDCFE"
}
},
{
"name": "Object keys, TS gammar specific",
"scope": "object-literal.member.key",
"settings": {
"foreground": "#9CDCFE"
}
},
{
"name": "CSS property value",
"scope": [
Expand All @@ -60,6 +77,13 @@
"settings": {
"foreground": "#CE9178"
}
},
{
"name": "JSX Tag names, workaround for flattening match with function",
"scope": "entity.name.function.tag",
"settings": {
"foreground": "#569cd6"
}
}
]
}
44 changes: 15 additions & 29 deletions themes/dark_vs.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@
"foreground": "#569cd6"
}
},
{
"scope": "entity.name.function",
"settings": {
"foreground": "#d4d4d4"
}
},
{
"scope": "entity.name.class",
"settings": {
"foreground": "#d4d4d4"
}
},
{
"scope": "entity.name.selector",
"settings": {
Expand Down Expand Up @@ -115,8 +103,7 @@
{
"scope": "markup.italic",
"settings": {
"fontStyle": "italic",
"foreground": "#569cd6"
"fontStyle": "italic"
}
},
{
Expand All @@ -138,23 +125,17 @@
}
},
{
"scope": "markup.punctuation.quote",
"scope": "markup.punctuation.quote.beginning",
"settings": {
"foreground": "#608b4e"
}
},
{
"scope": "markup.punctuation.list",
"scope": "markup.punctuation.list.beginning",
"settings": {
"foreground": "#6796e6"
}
},
{
"scope": ["markup.quote", "markup.list"],
"settings": {
"foreground": "#d4d4d4"
}
},
{
"scope": "markup.inline.raw",
"settings": {
Expand All @@ -168,8 +149,8 @@
}
},
{
"name": "brackets of XML tags",
"scope": ["meta.tag", "punctuation.tag.js", "punctuation.tag.tsx"],
"name": "brackets of XML/HTML tags",
"scope": "punctuation.definition.tag",
"settings": {
"foreground": "#808080"
}
Expand Down Expand Up @@ -277,7 +258,7 @@
}
},
{
"scope": "keyword.operator.new",
"scope": ["keyword.operator.new", "keyword.operator.expression"],
"settings": {
"foreground": "#569cd6"
}
Expand Down Expand Up @@ -313,10 +294,15 @@
"foreground": "#d4d4d4"
}
},


{
"scope": ["punctuation.definition.string.interpolation.start","punctuation.definition.string.interpolation.end"],
"name": "this.self",
"scope": "variable.language",
"settings": {
"foreground": "#569cd6"
}
},
{
"scope": ["punctuation.definition.string.interpolation.start","punctuation.definition.string.interpolation.end"],
"settings": {
"foreground": "#ba68c8"
}
Expand All @@ -326,6 +312,6 @@
"settings": {
"foreground": "#ba68c8"
}
}
}
]
}
56 changes: 43 additions & 13 deletions themes/light_plus.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@
"name": "Light+",
"include": "./light_vs.json",
"settings": [
{
"name": "Function declarations",
"scope": [
"entity.name.function",
"support.function"
],
"settings": {
"foreground": "#795E26"
}
},
{
"name": "Types declaration and references",
"scope": [
"meta.type.name",
"meta.return.type",
"meta.return-type",
"meta.cast",
"meta.type.annotation",
"support.class",
"support.type",
"entity.name.class",
"entity.name.type",
"storage.type.cs",
"storage.type.java"
Expand All @@ -21,13 +27,17 @@
}
},
{
"name": "Function declarations",
"name": "Types declaration and references, TS grammar specific",
"scope": [
"entity.name.function",
"entity.name.method"
"meta.return.type",
"meta.type.cast.expr",
"meta.type.new.expr",
"support.constant.math",
"support.constant.dom",
"support.constant.json"
],
"settings": {
"foreground": "#795E26"
"foreground": "#267f99"
}
},
{
Expand All @@ -38,22 +48,42 @@
}
},
{
"name": "Parameter name",
"name": "Variable and parameter name",
"scope": [
"meta.parameter.type.variable",
"variable.parameter",
"variable",
"variable.name"
"variable.name",
"support.variable"
],
"settings": {
"foreground": "#001080"
}
},
{
"scope": ["markup.quote", "markup.list"],
"name": "Object keys, TS gammar specific",
"scope": "object-literal.member.key",
"settings": {
"foreground": "#001080"
}
},
{
"name": "CSS property value",
"scope": [
"support.property-value",
"constant.rgb-value",
"support.property-value.scss",
"constant.rgb-value.scss"
],
"settings": {
"foreground": "#0451a5"
}
},
{
"name": "JSX Tag names, workaround for flattening match with function",
"scope": "entity.name.function.tag",
"settings": {
"foreground": "#800000"
}
}
]
}
27 changes: 14 additions & 13 deletions themes/light_vs.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@
{
"scope": "markup.italic",
"settings": {
"fontStyle": "italic",
"foreground": "#000080"
"fontStyle": "italic"
}
},
{
Expand All @@ -129,17 +128,11 @@
}
},
{
"scope": ["markup.punctuation.quote", "markup.punctuation.list"],
"scope": ["markup.punctuation.quote.beginning", "markup.punctuation.list.beginning"],
"settings": {
"foreground": "#0451a5"
}
},
{
"scope": ["markup.quote", "markup.list"],
"settings": {
"foreground": "#000000"
}
},
{
"scope": "markup.inline.raw",
"settings": {
Expand All @@ -153,7 +146,8 @@
}
},
{
"scope": "meta.tag",
"name": "brackets of XML/HTML tags",
"scope": "punctuation.definition.tag",
"settings": {
"foreground": "#800000"
}
Expand Down Expand Up @@ -255,7 +249,7 @@
}
},
{
"scope": "keyword.operator.new",
"scope": ["keyword.operator.new", "keyword.operator.expression"],
"settings": {
"foreground": "#0000ff"
}
Expand Down Expand Up @@ -298,7 +292,14 @@
}
},
{
"scope": ["punctuation.definition.string.interpolation.start","punctuation.definition.string.interpolation.end"],
"name": "this.self",
"scope": "variable.language",
"settings": {
"foreground": "#0000ff"
}
},
{
"scope": ["punctuation.definition.string.interpolation.start","punctuation.definition.string.interpolation.end"],
"settings": {
"foreground": "#ba68c8"
}
Expand All @@ -308,6 +309,6 @@
"settings": {
"foreground": "#ba68c8"
}
}
}
]
}

0 comments on commit e5741f7

Please sign in to comment.