Merge develop

This commit is contained in:
Mattia Astorino 2019-08-12 16:34:49 +02:00
commit 09300cd51a
No known key found for this signature in database
GPG key ID: CDFA82D8B1132C65
4 changed files with 1212 additions and 215 deletions

View file

@ -104,7 +104,7 @@
} }
}, },
"changelog": { "changelog": {
"lastversion": "29.1.0" "lastversion": "29.2.0"
}, },
"themeVariants": { "themeVariants": {
"Darker": "./themes/Material-Theme-Darker.json", "Darker": "./themes/Material-Theme-Darker.json",
@ -142,4 +142,4 @@
"Ocean": "vs-dark", "Ocean": "vs-dark",
"Ocean High Contrast": "vs-dark" "Ocean High Contrast": "vs-dark"
} }
} }

View file

@ -20,7 +20,7 @@
"url": "https://github.com/equinusocio/vsc-material-theme/issues" "url": "https://github.com/equinusocio/vsc-material-theme/issues"
}, },
"engines": { "engines": {
"vscode": "^1.31.0" "vscode": ">=1.36.0"
}, },
"scripts": { "scripts": {
"build": "yarn cleanup && yarn build-ts && yarn build-themes && yarn build-ui", "build": "yarn cleanup && yarn build-ts && yarn build-themes && yarn build-ui",

View file

@ -685,6 +685,8 @@
"button.background": "{{variant.scheme.selection}}", "button.background": "{{variant.scheme.selection}}",
"debugToolBar.background": "{{variant.scheme.background}}", "debugToolBar.background": "{{variant.scheme.background}}",
"pickerGroup.foreground": "{{commons.accents.Teal}}", "pickerGroup.foreground": "{{commons.accents.Teal}}",
"inputOption.activeBackground": "{{variant.scheme.foreground}}30",
"inputOption.activeBorder": "{{variant.scheme.foreground}}30",
"editorLineNumber.foreground": "{{variant.scheme.lineNumbers}}", "editorLineNumber.foreground": "{{variant.scheme.lineNumbers}}",

1419
yarn.lock

File diff suppressed because it is too large Load diff