Merge branch 'develop'
This commit is contained in:
commit
eb568d790a
3 changed files with 22 additions and 8 deletions
|
@ -214,7 +214,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@moxer/vscode-theme-generator": "1.6.4",
|
"@moxer/vscode-theme-generator": "1.13.1",
|
||||||
"@types/browserify": "12.0.36",
|
"@types/browserify": "12.0.36",
|
||||||
"@types/rimraf": "2.0.2",
|
"@types/rimraf": "2.0.2",
|
||||||
"@typescript-eslint/eslint-plugin": "2.12.0",
|
"@typescript-eslint/eslint-plugin": "2.12.0",
|
||||||
|
|
|
@ -38,7 +38,9 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
|
||||||
stringEscape: theme.scheme.foreground,
|
stringEscape: theme.scheme.foreground,
|
||||||
type: theme.scheme.base.paleblue,
|
type: theme.scheme.base.paleblue,
|
||||||
punctuation: theme.scheme.base.cyan,
|
punctuation: theme.scheme.base.cyan,
|
||||||
otherKeyword: theme.scheme.base.orange
|
otherKeyword: theme.scheme.base.orange,
|
||||||
|
variable: theme.scheme.foreground,
|
||||||
|
number: theme.scheme.base.orange
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Override all syntax tokens
|
* Override all syntax tokens
|
||||||
|
|
24
yarn.lock
24
yarn.lock
|
@ -18,10 +18,10 @@
|
||||||
esutils "^2.0.2"
|
esutils "^2.0.2"
|
||||||
js-tokens "^4.0.0"
|
js-tokens "^4.0.0"
|
||||||
|
|
||||||
"@moxer/vscode-theme-generator@1.6.4":
|
"@moxer/vscode-theme-generator@1.13.1":
|
||||||
version "1.6.4"
|
version "1.13.1"
|
||||||
resolved "https://registry.yarnpkg.com/@moxer/vscode-theme-generator/-/vscode-theme-generator-1.6.4.tgz#20b4153fba66c36329668cbb0bf30e2b2acc0a74"
|
resolved "https://registry.yarnpkg.com/@moxer/vscode-theme-generator/-/vscode-theme-generator-1.13.1.tgz#dc387e9f6f0f2b14407f9ddf7cf39952864954d8"
|
||||||
integrity sha512-LNo4UmlEs4AX8DZSVU6v070VCUd/sJTp4wG4vpyiuk7J5DjYhyvxzPfbhTmtTD4mI0KPX4tXQIIkOOvQAimhqg==
|
integrity sha512-c77E241sSIEYiKgG2VckD61pFo1sBzR9SR/YVdWuQ2XBOGlIBTeNTqcQG6DJjUquMARdPD7yUyZMFcjiI1ExSw==
|
||||||
dependencies:
|
dependencies:
|
||||||
ansi-styles "^3.2.1"
|
ansi-styles "^3.2.1"
|
||||||
argparse "^1.0.10"
|
argparse "^1.0.10"
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
resolve "^1.11.1"
|
resolve "^1.11.1"
|
||||||
semver "^5.7.0"
|
semver "^5.7.0"
|
||||||
sprintf-js "^1.0.3"
|
sprintf-js "^1.0.3"
|
||||||
supports-color "^5.5.0"
|
supports-color "^7.1.0"
|
||||||
tslib "^1.10.0"
|
tslib "^1.10.0"
|
||||||
tsutils "^2.29.0"
|
tsutils "^2.29.0"
|
||||||
wrappy "^1.0.2"
|
wrappy "^1.0.2"
|
||||||
|
@ -1468,6 +1468,11 @@ has-flag@^3.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
|
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
|
||||||
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
|
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
|
||||||
|
|
||||||
|
has-flag@^4.0.0:
|
||||||
|
version "4.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
|
||||||
|
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
|
||||||
|
|
||||||
has-symbols@^1.0.0:
|
has-symbols@^1.0.0:
|
||||||
version "1.0.0"
|
version "1.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
|
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
|
||||||
|
@ -2754,13 +2759,20 @@ supports-color@^2.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
|
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
|
||||||
integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
|
integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
|
||||||
|
|
||||||
supports-color@^5.3.0, supports-color@^5.5.0:
|
supports-color@^5.3.0:
|
||||||
version "5.5.0"
|
version "5.5.0"
|
||||||
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
|
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
|
||||||
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
|
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
|
||||||
dependencies:
|
dependencies:
|
||||||
has-flag "^3.0.0"
|
has-flag "^3.0.0"
|
||||||
|
|
||||||
|
supports-color@^7.1.0:
|
||||||
|
version "7.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
|
||||||
|
integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
|
||||||
|
dependencies:
|
||||||
|
has-flag "^4.0.0"
|
||||||
|
|
||||||
syntax-error@^1.1.1:
|
syntax-error@^1.1.1:
|
||||||
version "1.4.0"
|
version "1.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
|
resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
|
||||||
|
|
Loading…
Reference in a new issue