Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,20 @@
+<a name="1.0.4"></a>
+## [1.0.4](https://github.com/equinusocio/vsc-material-theme/compare/v1.0.3...v1.0.4) (2017-09-29)
+
+
+### Bug Fixes
+
+* Fix show changelog command ([95e6c96](https://github.com/equinusocio/vsc-material-theme/commit/95e6c96))
+* Improve tab inactive foreground contrast ([5ca17f5](https://github.com/equinusocio/vsc-material-theme/commit/5ca17f5))
+
+
+### Features
+
+* Add .asp, .aspx and .ascx file icon ([144276a](https://github.com/equinusocio/vsc-material-theme/commit/144276a)), closes [#96](https://github.com/equinusocio/vsc-material-theme/issues/96)
+* Add .mjs file icon ([4b6430e](https://github.com/equinusocio/vsc-material-theme/commit/4b6430e)), closes [#93](https://github.com/equinusocio/vsc-material-theme/issues/93)
+
+
+
 <a name="1.0.3"></a>
 ## [1.0.3](https://github.com/equinusocio/vsc-material-theme/compare/v1.0.2...v1.0.3) (2017-09-27)
 
@@ -60,8 +77,8 @@
 
 ### Features
 
-* adds theme accents config. ([f264542](https://github.com/equinusocio/vsc-material-theme/commit/f264542))
 * Adds theme changer command ([7cf5e6e](https://github.com/equinusocio/vsc-material-theme/commit/7cf5e6e))
+* adds theme accents config. ([f264542](https://github.com/equinusocio/vsc-material-theme/commit/f264542))
 
 
 
@@ -110,9 +127,9 @@
 * Fix invalids color highlight ([b296323](https://github.com/equinusocio/vsc-material-theme/commit/b296323)), closes [#40](https://github.com/equinusocio/vsc-material-theme/issues/40)
 * Fix notification bar foreground on Lighter ([e421292](https://github.com/equinusocio/vsc-material-theme/commit/e421292)), closes [#34](https://github.com/equinusocio/vsc-material-theme/issues/34)
 * Fix selectionHighlightBackground color ([4471e8a](https://github.com/equinusocio/vsc-material-theme/commit/4471e8a)), closes [#38](https://github.com/equinusocio/vsc-material-theme/issues/38)
-* improve C# highlight ([2729ae4](https://github.com/equinusocio/vsc-material-theme/commit/2729ae4)), closes [#26](https://github.com/equinusocio/vsc-material-theme/issues/26)
 * Improve c++ syntax highlight ([cd7415e](https://github.com/equinusocio/vsc-material-theme/commit/cd7415e))
 * Temporary fix buttons background ([1b5534f](https://github.com/equinusocio/vsc-material-theme/commit/1b5534f)), closes [#37](https://github.com/equinusocio/vsc-material-theme/issues/37)
+* improve C# highlight ([2729ae4](https://github.com/equinusocio/vsc-material-theme/commit/2729ae4)), closes [#26](https://github.com/equinusocio/vsc-material-theme/issues/26)
 
 
 
@@ -134,12 +151,7 @@
 
 
 <a name="0.0.12"></a>
-## [0.0.12](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.9...v0.0.12) (2017-05-04)
+## [0.0.12](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.8...v0.0.12) (2017-05-04)
-
-
-
-<a name="0.0.9"></a>
-## [0.0.9](https://github.com/equinusocio/vsc-material-theme/compare/v0.0.8...v0.0.9) (2017-04-30)
 
 
 ### Bug Fixes
@@ -164,19 +176,19 @@
 
 * Add bower icon ([b326f26](https://github.com/equinusocio/vsc-material-theme/commit/b326f26))
 * Fix background color for highlighted searched string ([fc94c09](https://github.com/equinusocio/vsc-material-theme/commit/fc94c09)), closes [#4](https://github.com/equinusocio/vsc-material-theme/issues/4)
-* fix lighter scheme colors ([100c02c](https://github.com/equinusocio/vsc-material-theme/commit/100c02c))
 * Fix opened folder icon ([b21c04f](https://github.com/equinusocio/vsc-material-theme/commit/b21c04f)), closes [#1](https://github.com/equinusocio/vsc-material-theme/issues/1)
 * Fix some file and folder icons  ([5526e62](https://github.com/equinusocio/vsc-material-theme/commit/5526e62))
 * Fix var hover background ([a471a2a](https://github.com/equinusocio/vsc-material-theme/commit/a471a2a))
 * Update json icon ([2793178](https://github.com/equinusocio/vsc-material-theme/commit/2793178))
 * Update some file icons ([88b4739](https://github.com/equinusocio/vsc-material-theme/commit/88b4739))
+* fix lighter scheme colors ([100c02c](https://github.com/equinusocio/vsc-material-theme/commit/100c02c))
 * **Icons:** Fix .ts and def ts icons ([e8e9b49](https://github.com/equinusocio/vsc-material-theme/commit/e8e9b49)), closes [#10](https://github.com/equinusocio/vsc-material-theme/issues/10)
 
 
 ### Features
 
-* Add lighter theme (wip) ([8827f12](https://github.com/equinusocio/vsc-material-theme/commit/8827f12))
 * Add Material Theme icon-theme ([8defc56](https://github.com/equinusocio/vsc-material-theme/commit/8defc56))
+* Add lighter theme (wip) ([8827f12](https://github.com/equinusocio/vsc-material-theme/commit/8827f12))
 * first beta release ([262097f](https://github.com/equinusocio/vsc-material-theme/commit/262097f))
 * **Icons:** Add new filetype icons ([50debfe](https://github.com/equinusocio/vsc-material-theme/commit/50debfe))
 * **Icons:** Add new icons ([d02f2fe](https://github.com/equinusocio/vsc-material-theme/commit/d02f2fe))

extensions/helpers/changelog.ts

@@ -5,7 +5,7 @@ import { getDefaultValues, getPackageJSON, writeFile } from "./fs";
 import { PATHS } from '../consts/paths';
 
 function previewFile(): void {
-  let uri = vscode.Uri.parse(path.join('file:///', PATHS.VSIX_DIR, './CHANGELOG.md'));
+  let uri = vscode.Uri.file(path.join(PATHS.VSIX_DIR, './CHANGELOG.md'));
 
   vscode.commands.executeCommand('markdown.showPreview', uri);
 

package.json

@@ -2,7 +2,7 @@
   "name": "vsc-material-theme",
   "displayName": "Material Theme",
   "description": "The most epic theme now for Visual Studio Code",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publisher": "Equinusocio",
   "license": "Apache-2.0",
   "icon": "logo.png",
@@ -71,7 +71,7 @@
       {
         "label": "Material Theme",
         "uiTheme": "vs-dark",
-        "path": "./themes/Material-Theme-Palenight.json"
+        "path": "./themes/Material-Theme-Default.json"
       }
     ],
     "iconThemes": [