Merge branch 'develop'

This commit is contained in:
Mattia Astorino 2020-04-23 21:58:43 +02:00
commit 565d3dfc22
No known key found for this signature in database
GPG key ID: CDFA82D8B1132C65
3 changed files with 19 additions and 8 deletions

View file

@ -2,7 +2,7 @@
"name": "vsc-material-theme", "name": "vsc-material-theme",
"displayName": "Material Theme", "displayName": "Material Theme",
"description": "The most epic theme now for Visual Studio Code", "description": "The most epic theme now for Visual Studio Code",
"version": "32.5.0", "version": "32.6.0",
"publisher": "Equinusocio", "publisher": "Equinusocio",
"license": "Apache-2.0", "license": "Apache-2.0",
"author": "Mattia Astorino [@equinusocio]", "author": "Mattia Astorino [@equinusocio]",
@ -168,7 +168,7 @@
} }
], ],
"devDependencies": { "devDependencies": {
"@moxer/vscode-theme-generator": "1.17.0", "@moxer/vscode-theme-generator": "1.19.0",
"@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

@ -3,6 +3,7 @@ import {ThemeSetting} from './types';
export const getColorSet = (theme: ThemeSetting): IColorSet => { export const getColorSet = (theme: ThemeSetting): IColorSet => {
return { return {
semanticHighlighting: true,
base: { base: {
// Determines the overall background color // Determines the overall background color
background: theme.scheme.background, background: theme.scheme.background,
@ -366,6 +367,11 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
*/ */
'dropdown.background': theme.scheme.background, 'dropdown.background': theme.scheme.background,
'dropdown.border': theme.scheme.inputBorder, 'dropdown.border': theme.scheme.inputBorder,
/**
* Quick Panel
*/
'quickInput.background': theme.scheme.background,
'quickInput.foreground': theme.scheme.sidebarForeground,
/** /**
* Lists style * Lists style
*/ */

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.17.0": "@moxer/vscode-theme-generator@1.19.0":
version "1.17.0" version "1.19.0"
resolved "https://registry.yarnpkg.com/@moxer/vscode-theme-generator/-/vscode-theme-generator-1.17.0.tgz#b1743803868132f2516572ce69185c9b08f3ab3d" resolved "https://registry.yarnpkg.com/@moxer/vscode-theme-generator/-/vscode-theme-generator-1.19.0.tgz#fd859c62035801a37181ed8d1ca255c5b2827b7d"
integrity sha512-4g6PvPLvvVWK788YGM6awRnd64hw2YGrTaXD8vyv9f5KR0+sYp6TNGdatm60W4RP6R98rL16hFfXESATfVVvww== integrity sha512-4t0/KX7r+SMxyfWyFvp/B2N3M8dw0tkc6YHaP90ymiPQnqXRzJP7NA7DzD/JgGfej7fdX1caKM0tcTqbKSrn0Q==
dependencies: dependencies:
ansi-styles "^3.2.1" ansi-styles "^3.2.1"
argparse "^1.0.10" argparse "^1.0.10"
@ -47,7 +47,7 @@
js-tokens "^4.0.0" js-tokens "^4.0.0"
js-yaml "^3.13.1" js-yaml "^3.13.1"
minimatch "^3.0.4" minimatch "^3.0.4"
minimist "^0.0.8" minimist "^1.2.3"
mkdirp "^0.5.1" mkdirp "^0.5.1"
once "^1.4.0" once "^1.4.0"
path-is-absolute "^1.0.1" path-is-absolute "^1.0.1"
@ -1953,7 +1953,7 @@ minimatch@3.0.4, minimatch@^3.0.4:
dependencies: dependencies:
brace-expansion "^1.1.7" brace-expansion "^1.1.7"
minimist@0.0.8, minimist@^0.0.8: minimist@0.0.8:
version "0.0.8" version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
@ -1963,6 +1963,11 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
minimist@^1.2.3:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1: mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
version "0.5.1" version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"