Merge branch 'develop'

This commit is contained in:
Mattia Astorino 2020-02-15 13:28:58 +01:00
commit 732cfa9290
No known key found for this signature in database
GPG key ID: CDFA82D8B1132C65
2 changed files with 6 additions and 4 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.4.0", "version": "32.5.0",
"publisher": "Equinusocio", "publisher": "Equinusocio",
"license": "Apache-2.0", "license": "Apache-2.0",
"author": "Mattia Astorino [@equinusocio]", "author": "Mattia Astorino [@equinusocio]",
@ -52,7 +52,8 @@
"*" "*"
], ],
"extensionKind": [ "extensionKind": [
"ui" "ui",
"workspace"
], ],
"main": "./build/material.theme.config", "main": "./build/material.theme.config",
"contributes": { "contributes": {

View file

@ -179,7 +179,7 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
'widget.shadow': theme.scheme.shadow, 'widget.shadow': theme.scheme.shadow,
'scrollbar.shadow': theme.scheme.shadow, 'scrollbar.shadow': theme.scheme.shadow,
'editorLink.activeForeground': theme.scheme.foreground, 'editorLink.activeForeground': theme.scheme.foreground,
'selection.background': theme.scheme.defaultAccent, 'selection.background': `${theme.scheme.lineHighlight}80`,
'progressBar.background': theme.scheme.defaultAccent, 'progressBar.background': theme.scheme.defaultAccent,
'debugToolBar.background': theme.scheme.background, 'debugToolBar.background': theme.scheme.background,
'pickerGroup.foreground': theme.scheme.defaultAccent, 'pickerGroup.foreground': theme.scheme.defaultAccent,
@ -351,9 +351,10 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
* Textfield and inputs style * Textfield and inputs style
*/ */
'input.background': theme.scheme.inputBackground, 'input.background': theme.scheme.inputBackground,
'input.foreground': theme.scheme.inputForeground, 'input.foreground': theme.scheme.foreground,
'input.placeholderForeground': `${theme.scheme.foreground}60`, 'input.placeholderForeground': `${theme.scheme.foreground}60`,
'input.border': theme.scheme.inputBorder, 'input.border': theme.scheme.inputBorder,
/** /**
* Inputs validation style * Inputs validation style
*/ */