forks/vsc-material-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Mattia Astorino 2018-11-25 23:09:15 +01:00
commit 706320a0f7
4 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/defaults.json
View file

@ -116,7 +116,7 @@
} }
}, },
"changelog": { "changelog": {
"lastversion": "2.5.1" "lastversion": "2.6.0"
}, },
"icons": { "icons": {
"theme": { "theme": {

2
extensions/helpers/settings.ts
View file

@ -44,7 +44,7 @@ export function isAccent(accentName: string, defaults: IDefaults): boolean {
*/ */
export function isMaterialTheme(themeName: string): boolean { export function isMaterialTheme(themeName: string): boolean {
const packageJSON = getPackageJSON(); const packageJSON = getPackageJSON();
return Boolean(packageJSON.contributes.themes.find(contrib => contrib.id === themeName)); return Boolean(packageJSON.contributes.themes.find(contrib => contrib.label === themeName));
} }
/** /**

1
extensions/interfaces/ipackage.json.ts
View file

@ -24,7 +24,6 @@ export interface IPackageJSONCommand {
} }
export interface IPackageJSONTheme { export interface IPackageJSONTheme {
id: string;
label: string; label: string;
path: string; path: string;
uiTheme: string; uiTheme: string;

18
package.json
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": "2.6.0", "version": "2.6.1",
"publisher": "Equinusocio", "publisher": "Equinusocio",
"license": "Apache-2.0", "license": "Apache-2.0",
"author": "Mattia Astorino [@equinusocio]", "author": "Mattia Astorino [@equinusocio]",
@ -60,7 +60,7 @@
{ {
"command": "materialTheme.toggleApplyIcons", "command": "materialTheme.toggleApplyIcons",
"title": "Enable or disable icons auto-applying", "title": "Enable or disable icons auto-applying",
"category": "🎨 Material Theme" "category": "💅 Material Theme"
}, },
{ {
"command": "materialTheme.setAccent", "command": "materialTheme.setAccent",
@ -70,12 +70,12 @@
{ {
"command": "materialTheme.fixIcons", "command": "materialTheme.fixIcons",
"title": "Fix file icons", "title": "Fix file icons",
"category": "🎨 Material Theme" "category": "🛠 Material Theme"
}, },
{ {
"command": "materialTheme.showReleaseNotes", "command": "materialTheme.showReleaseNotes",
"title": "Release Notes", "title": "Release Notes",
"category": "🎨 Material Theme" "category": "📋 Material Theme"
} }
], ],
"configuration": { "configuration": {
@ -122,61 +122,51 @@
}, },
"themes": [ "themes": [
{ {
"id": "eq-material-theme-default",
"label": "Material Theme", "label": "Material Theme",
"path": "./themes/Material-Theme-Default.json", "path": "./themes/Material-Theme-Default.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-default-high-contrast",
"label": "Material Theme High Contrast", "label": "Material Theme High Contrast",
"path": "./themes/Material-Theme-Default-High-Contrast.json", "path": "./themes/Material-Theme-Default-High-Contrast.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-darker",
"label": "Material Theme Darker", "label": "Material Theme Darker",
"path": "./themes/Material-Theme-Darker.json", "path": "./themes/Material-Theme-Darker.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-darker-high-contrast",
"label": "Material Theme Darker High Contrast", "label": "Material Theme Darker High Contrast",
"path": "./themes/Material-Theme-Darker-High-Contrast.json", "path": "./themes/Material-Theme-Darker-High-Contrast.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-palenight",
"label": "Material Theme Palenight", "label": "Material Theme Palenight",
"path": "./themes/Material-Theme-Palenight.json", "path": "./themes/Material-Theme-Palenight.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-palenight-high-contrast",
"label": "Material Theme Palenight High Contrast", "label": "Material Theme Palenight High Contrast",
"path": "./themes/Material-Theme-Palenight-High-Contrast.json", "path": "./themes/Material-Theme-Palenight-High-Contrast.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-ocean",
"label": "Material Theme Ocean", "label": "Material Theme Ocean",
"path": "./themes/Material-Theme-Ocean.json", "path": "./themes/Material-Theme-Ocean.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-ocean-high-contrast",
"label": "Material Theme Ocean High Contrast", "label": "Material Theme Ocean High Contrast",
"path": "./themes/Material-Theme-Ocean-High-Contrast.json", "path": "./themes/Material-Theme-Ocean-High-Contrast.json",
"uiTheme": "vs-dark" "uiTheme": "vs-dark"
}, },
{ {
"id": "eq-material-theme-lighter",
"label": "Material Theme Lighter", "label": "Material Theme Lighter",
"path": "./themes/Material-Theme-Lighter.json", "path": "./themes/Material-Theme-Lighter.json",
"uiTheme": "vs" "uiTheme": "vs"
}, },
{ {
"id": "eq-material-theme-lighter-high-contrast",
"label": "Material Theme Lighter High Contrast", "label": "Material Theme Lighter High Contrast",
"path": "./themes/Material-Theme-Lighter-High-Contrast.json", "path": "./themes/Material-Theme-Lighter-High-Contrast.json",
"uiTheme": "vs" "uiTheme": "vs"