Merge branch 'develop'
This commit is contained in:
commit
706320a0f7
4 changed files with 6 additions and 17 deletions
|
@ -116,7 +116,7 @@
|
|||
}
|
||||
},
|
||||
"changelog": {
|
||||
"lastversion": "2.5.1"
|
||||
"lastversion": "2.6.0"
|
||||
},
|
||||
"icons": {
|
||||
"theme": {
|
||||
|
|
|
@ -44,7 +44,7 @@ export function isAccent(accentName: string, defaults: IDefaults): boolean {
|
|||
*/
|
||||
export function isMaterialTheme(themeName: string): boolean {
|
||||
const packageJSON = getPackageJSON();
|
||||
return Boolean(packageJSON.contributes.themes.find(contrib => contrib.id === themeName));
|
||||
return Boolean(packageJSON.contributes.themes.find(contrib => contrib.label === themeName));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -24,7 +24,6 @@ export interface IPackageJSONCommand {
|
|||
}
|
||||
|
||||
export interface IPackageJSONTheme {
|
||||
id: string;
|
||||
label: string;
|
||||
path: string;
|
||||
uiTheme: string;
|
||||
|
|
18
package.json
18
package.json
|
@ -2,7 +2,7 @@
|
|||
"name": "vsc-material-theme",
|
||||
"displayName": "Material Theme",
|
||||
"description": "The most epic theme now for Visual Studio Code",
|
||||
"version": "2.6.0",
|
||||
"version": "2.6.1",
|
||||
"publisher": "Equinusocio",
|
||||
"license": "Apache-2.0",
|
||||
"author": "Mattia Astorino [@equinusocio]",
|
||||
|
@ -60,7 +60,7 @@
|
|||
{
|
||||
"command": "materialTheme.toggleApplyIcons",
|
||||
"title": "Enable or disable icons auto-applying",
|
||||
"category": "🎨 Material Theme"
|
||||
"category": "💅 Material Theme"
|
||||
},
|
||||
{
|
||||
"command": "materialTheme.setAccent",
|
||||
|
@ -70,12 +70,12 @@
|
|||
{
|
||||
"command": "materialTheme.fixIcons",
|
||||
"title": "Fix file icons",
|
||||
"category": "🎨 Material Theme"
|
||||
"category": "🛠 Material Theme"
|
||||
},
|
||||
{
|
||||
"command": "materialTheme.showReleaseNotes",
|
||||
"title": "Release Notes",
|
||||
"category": "🎨 Material Theme"
|
||||
"category": "📋 Material Theme"
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
|
@ -122,61 +122,51 @@
|
|||
},
|
||||
"themes": [
|
||||
{
|
||||
"id": "eq-material-theme-default",
|
||||
"label": "Material Theme",
|
||||
"path": "./themes/Material-Theme-Default.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-default-high-contrast",
|
||||
"label": "Material Theme High Contrast",
|
||||
"path": "./themes/Material-Theme-Default-High-Contrast.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-darker",
|
||||
"label": "Material Theme Darker",
|
||||
"path": "./themes/Material-Theme-Darker.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-darker-high-contrast",
|
||||
"label": "Material Theme Darker High Contrast",
|
||||
"path": "./themes/Material-Theme-Darker-High-Contrast.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-palenight",
|
||||
"label": "Material Theme Palenight",
|
||||
"path": "./themes/Material-Theme-Palenight.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-palenight-high-contrast",
|
||||
"label": "Material Theme Palenight High Contrast",
|
||||
"path": "./themes/Material-Theme-Palenight-High-Contrast.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-ocean",
|
||||
"label": "Material Theme Ocean",
|
||||
"path": "./themes/Material-Theme-Ocean.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-ocean-high-contrast",
|
||||
"label": "Material Theme Ocean High Contrast",
|
||||
"path": "./themes/Material-Theme-Ocean-High-Contrast.json",
|
||||
"uiTheme": "vs-dark"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-lighter",
|
||||
"label": "Material Theme Lighter",
|
||||
"path": "./themes/Material-Theme-Lighter.json",
|
||||
"uiTheme": "vs"
|
||||
},
|
||||
{
|
||||
"id": "eq-material-theme-lighter-high-contrast",
|
||||
"label": "Material Theme Lighter High Contrast",
|
||||
"path": "./themes/Material-Theme-Lighter-High-Contrast.json",
|
||||
"uiTheme": "vs"
|
||||
|
|
Loading…
Reference in a new issue