Merge branch 'develop'

This commit is contained in:
Mattia Astorino 2020-01-15 20:25:42 +01:00
commit 50f401af48
No known key found for this signature in database
GPG key ID: CDFA82D8B1132C65
3 changed files with 6 additions and 6 deletions

View file

@ -167,7 +167,7 @@
} }
], ],
"devDependencies": { "devDependencies": {
"@moxer/vscode-theme-generator": "1.16.2", "@moxer/vscode-theme-generator": "1.16.7",
"@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",

View file

@ -23,7 +23,7 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
*/ */
syntax: { syntax: {
boolean: theme.scheme.base.pink, boolean: theme.scheme.base.pink,
class: theme.scheme.base.purple, class: theme.scheme.base.yellow,
classMember: theme.scheme.base.red, classMember: theme.scheme.base.red,
comment: theme.scheme.comments, comment: theme.scheme.comments,
cssClass: theme.scheme.base.yellow, cssClass: theme.scheme.base.yellow,

View file

@ -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.16.2": "@moxer/vscode-theme-generator@1.16.7":
version "1.16.2" version "1.16.7"
resolved "https://registry.yarnpkg.com/@moxer/vscode-theme-generator/-/vscode-theme-generator-1.16.2.tgz#60f93b5402ad06b80d001326bd607efb8d0d65d1" resolved "https://registry.yarnpkg.com/@moxer/vscode-theme-generator/-/vscode-theme-generator-1.16.7.tgz#d12ad1d0130dd2a2691b623525d6f7c608992766"
integrity sha512-fZGqoIsaEy46jfFAtULAIjhqV/i+Qe9IECPxls/IUyNyhUO45tDaLfUu4VHjZlHYFyg519iyyuiY8h0kKywsLg== integrity sha512-OGbsAYqMVUkTkntOG6gLxS5PxV+zVnwKRz1JdywXXF6tPNznX2PIk2zFcz6dhNvEh3Mg0xhi3lGhJdIr6iE23A==
dependencies: dependencies:
ansi-styles "^3.2.1" ansi-styles "^3.2.1"
argparse "^1.0.10" argparse "^1.0.10"