diff --git a/.npmignore b/.npmignore deleted file mode 100644 index aa8e45f..0000000 --- a/.npmignore +++ /dev/null @@ -1 +0,0 @@ -src/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8a996..b6966c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,17 @@ - -## 0.0.4 (2017-02-09) + +## 0.0.5 (2017-02-11) ### Bug Fixes -* 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 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 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)) +* Fix some file and folder icons ([5526e62](https://github.com/equinusocio/vsc-material-theme/commit/5526e62)) +* Update some file icons ([88b4739](https://github.com/equinusocio/vsc-material-theme/commit/88b4739)) ### 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)) -* first beta release ([262097f](https://github.com/equinusocio/vsc-material-theme/commit/262097f)) +* **Icons:** Add new icons ([d02f2fe](https://github.com/equinusocio/vsc-material-theme/commit/d02f2fe)) diff --git a/README.md b/README.md index 05298e1..24c8691 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,33 @@ -# Material Theme β for Visual Studio Code +

+ ### Beta (β) release -The most epic theme meet Visual Studio Code. If you have problems, first search for a similiar issue and then report a new one. +[![GitHub tag](https://img.shields.io/github/release/equinusocio/vsc-material-theme.svg?style=flat-square)](https://github.com/equinusocio/vsc-material-theme/releases) +[![Beerpay](https://beerpay.io/equinusocio/vsc-material-theme/badge.svg?style=beer)](https://beerpay.io/equinusocio/vsc-material-theme) + +The most epic theme meet Visual Studio Code. Please note that this theme is still in Beta (β) release. You can help by reporting issues [here](https://github.com/equinusocio/vsc-material-theme/issues) + + +# Easy installation +You can install this awesome theme through the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme). +1. Press cmd/ctrl + P +2. Type `ext install vsc-material-theme` + + +# Activate the theme + +1. Press cmd/ctrl + Shift + P and type `color`, then select **Color Theme** +2. Select `Material Theme Darker` or `Material Theme Lighter` fromt the list, then press **Enter** + + +# Recommended settings for a better experience: + +```json + // Controls the font family. + "editor.fontFamily": "Operator Mono", + // Controls the line height. Use 0 to compute the lineHeight from the fontSize. + "editor.lineHeight": 24, + // Enables font ligatures + "editor.fontLigatures": true, +``` \ No newline at end of file diff --git a/package.json b/package.json index 9d102c7..1affae1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vsc-material-theme", "displayName": "Material Theme", "description": "The most epic theme now for Visual Studio Code", - "version": "0.0.4", + "version": "0.0.5", "publisher": "Equinusocio", "license": "Apache-2.0", "icon": "logo.png", @@ -25,7 +25,10 @@ "start": "npm run remove-min && npm run minimize-icons && npm run minimize-json", "minimize-icons": "svgo -f src/icons -o dist/icons", "minimize-json": "json-minify src/material-theme-icons.json > dist/material-theme-icons.json", - "remove-min": "rimraf min" + "remove-min": "rimraf min", + "release": "npm run bump && npm run changelog", + "changelog": "gulp changelog", + "bump": "gulp bump" }, "categories": [ "Themes", diff --git a/src/icons/ai.svg b/src/icons/ai.svg new file mode 100644 index 0000000..dcad0f0 --- /dev/null +++ b/src/icons/ai.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/coffee.svg b/src/icons/coffee.svg index a410a9c..9495cef 100755 --- a/src/icons/coffee.svg +++ b/src/icons/coffee.svg @@ -1,55 +1,3 @@ - - - - - - image/svg+xml - - - - - - - - + + diff --git a/src/icons/console.svg b/src/icons/console.svg index 952e532..05e0344 100755 --- a/src/icons/console.svg +++ b/src/icons/console.svg @@ -1,54 +1,3 @@ - - - - - - image/svg+xml - - - - - - - + + diff --git a/src/icons/dlang.svg b/src/icons/dlang.svg new file mode 100644 index 0000000..40b13c6 --- /dev/null +++ b/src/icons/dlang.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/folder-light.svg b/src/icons/folder-light.svg new file mode 100644 index 0000000..54846de --- /dev/null +++ b/src/icons/folder-light.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/folder-outline.svg b/src/icons/folder-outline.svg index ee47427..a59c192 100644 --- a/src/icons/folder-outline.svg +++ b/src/icons/folder-outline.svg @@ -1,14 +1,3 @@ - - - - - - - + + diff --git a/src/icons/folder.svg b/src/icons/folder.svg index c9fdf3c..a99899a 100644 --- a/src/icons/folder.svg +++ b/src/icons/folder.svg @@ -1,13 +1,3 @@ - - - - - - - + + diff --git a/src/icons/git.svg b/src/icons/git.svg index d8ae975..89a4c3c 100755 --- a/src/icons/git.svg +++ b/src/icons/git.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/github.svg b/src/icons/github.svg new file mode 100644 index 0000000..6edfae5 --- /dev/null +++ b/src/icons/github.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/grunt.svg b/src/icons/grunt.svg new file mode 100644 index 0000000..94a8442 --- /dev/null +++ b/src/icons/grunt.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/image.svg b/src/icons/image.svg index e7a71bb..c37763f 100755 --- a/src/icons/image.svg +++ b/src/icons/image.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/license.svg b/src/icons/license.svg new file mode 100644 index 0000000..56f79ca --- /dev/null +++ b/src/icons/license.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/markdown.svg b/src/icons/markdown.svg index c7f505a..18cdeaf 100755 --- a/src/icons/markdown.svg +++ b/src/icons/markdown.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/markup.svg b/src/icons/markup.svg new file mode 100644 index 0000000..25ac918 --- /dev/null +++ b/src/icons/markup.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/icons/nodejs.svg b/src/icons/nodejs.svg old mode 100755 new mode 100644 index 53d78f7..c8cd6a0 --- a/src/icons/nodejs.svg +++ b/src/icons/nodejs.svg @@ -1,54 +1,3 @@ - - - - - - image/svg+xml - - - - - - - + + diff --git a/src/icons/ocaml.svg b/src/icons/ocaml.svg index 030ad2d..12c4dd4 100755 --- a/src/icons/ocaml.svg +++ b/src/icons/ocaml.svg @@ -1,199 +1,3 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff --git a/src/icons/php.svg b/src/icons/php.svg index e92929d..8af9132 100755 --- a/src/icons/php.svg +++ b/src/icons/php.svg @@ -1,54 +1,3 @@ - - - - - - image/svg+xml - - - - - - - + + diff --git a/src/icons/procfile.svg b/src/icons/procfile.svg new file mode 100644 index 0000000..d0cc0fe --- /dev/null +++ b/src/icons/procfile.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/pug.svg b/src/icons/pug.svg index 236da83..8dfa46a 100755 --- a/src/icons/pug.svg +++ b/src/icons/pug.svg @@ -1,54 +1,11 @@ - - - - - - image/svg+xml - - - - - - - + + + + + + + + + + diff --git a/src/icons/python.svg b/src/icons/python.svg index 788d1cb..5643e9c 100755 --- a/src/icons/python.svg +++ b/src/icons/python.svg @@ -1,68 +1,3 @@ - - - - - - image/svg+xml - - - - - - - - - - + + diff --git a/src/icons/react.svg b/src/icons/react.svg index 0a055da..95fdef4 100755 --- a/src/icons/react.svg +++ b/src/icons/react.svg @@ -1,54 +1,3 @@ - - - - - - image/svg+xml - - - - - - - + + diff --git a/src/icons/ruby.svg b/src/icons/ruby.svg index e7afd20..e91a776 100755 --- a/src/icons/ruby.svg +++ b/src/icons/ruby.svg @@ -1,54 +1,6 @@ - - - - - - image/svg+xml - - - - - - - + + + + + diff --git a/src/icons/sass.svg b/src/icons/sass.svg index a372f5b..4e448be 100755 --- a/src/icons/sass.svg +++ b/src/icons/sass.svg @@ -1,54 +1,3 @@ - - - - - - image/svg+xml - - - - - - - + + diff --git a/src/icons/sketch.svg b/src/icons/sketch.svg new file mode 100644 index 0000000..61b3083 --- /dev/null +++ b/src/icons/sketch.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/icons/stylus.svg b/src/icons/stylus.svg new file mode 100644 index 0000000..5ff74bf --- /dev/null +++ b/src/icons/stylus.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/icons/sublime.svg b/src/icons/sublime.svg new file mode 100644 index 0000000..8a9d10f --- /dev/null +++ b/src/icons/sublime.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/svg.svg b/src/icons/svg.svg new file mode 100644 index 0000000..dd0f1e0 --- /dev/null +++ b/src/icons/svg.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/swig.svg b/src/icons/swig.svg new file mode 100644 index 0000000..5e20edf --- /dev/null +++ b/src/icons/swig.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/todo.svg b/src/icons/todo.svg new file mode 100644 index 0000000..515e729 --- /dev/null +++ b/src/icons/todo.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/twig.svg b/src/icons/twig.svg new file mode 100644 index 0000000..a3ae0c6 --- /dev/null +++ b/src/icons/twig.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/yaml.svg b/src/icons/yaml.svg index 317d881..e19a2b5 100755 --- a/src/icons/yaml.svg +++ b/src/icons/yaml.svg @@ -1,54 +1,3 @@ - - - - - - image/svg+xml - - - - - - - + + diff --git a/src/icons/zip.svg b/src/icons/zip.svg index 277a4df..c1cf4bc 100755 --- a/src/icons/zip.svg +++ b/src/icons/zip.svg @@ -1,54 +1,7 @@ - - - - - - image/svg+xml - - - - - - - + + + + + + diff --git a/src/material-theme-icons.json b/src/material-theme-icons.json index 6252bd9..dafbbba 100644 --- a/src/material-theme-icons.json +++ b/src/material-theme-icons.json @@ -1,5 +1,41 @@ { "iconDefinitions": { + "_file_stylus": { + "iconPath": "./icons/stylus.svg" + }, + "_file_swig": { + "iconPath": "./icons/swig.svg" + }, + "_file_twig": { + "iconPath": "./icons/twig.svg" + }, + "_file_sketch": { + "iconPath": "./icons/sketch.svg" + }, + "_file_procfile": { + "iconPath": "./icons/procfile.svg" + }, + "_file_todo": { + "iconPath": "./icons/todo.svg" + }, + "_file_license": { + "iconPath": "./icons/license.svg" + }, + "_file_markup": { + "iconPath": "./icons/markup.svg" + }, + "_file_sublime": { + "iconPath": "./icons/sublime.svg" + }, + "_file_grunt": { + "iconPath": "./icons/grunt.svg" + }, + "_file_ai": { + "iconPath": "./icons/ai.svg" + }, + "_file_svg": { + "iconPath": "./icons/svg.svg" + }, "_file_bower": { "iconPath": "./icons/bower.svg" }, @@ -30,6 +66,9 @@ "_file_git": { "iconPath": "./icons/git.svg" }, + "_file_github": { + "iconPath": "./icons/github.svg" + }, "_file_image": { "iconPath": "./icons/image.svg" }, @@ -267,23 +306,33 @@ "_folder_dark": { "iconPath": "./icons/folder.svg" }, - "_folder_open_dark": { - "iconPath": "./icons/folder-outline.svg" - }, "_folder_light": { - "iconPath": "./icons/folder.svg" + "iconPath": "./icons/folder-light.svg" }, - "_folder_open_light": { + "_folder_open": { "iconPath": "./icons/folder-outline.svg" }, "_file_npm": { "iconPath": "./icons/npm.svg" } }, - "folderExpanded": "_folder_open_dark", + "folderExpanded": "_folder_open", "folder": "_folder_dark", + "light": { + "folderExpanded": "_folder_open", + "folder": "_folder_light" + }, "file": "_file_dark", "fileExtensions": { + "styl": "_file_stylus", + "twig": "_file_twig", + "swig": "_file_swig", + "sketch": "_file_sketch", + "do": "_file_todo", + "sublime-settings": "_file_sublime", + "sublime-theme": "_file_sublime", + "sublime-commands": "_file_sublime", + "sublime-menu": "_file_sublime", "html": "_file_html", "jade": "_file_pug", "pug": "_file_pug", @@ -313,7 +362,9 @@ "jpeg": "_file_image", "jpg": "_file_image", "gif": "_file_image", - "svg": "_file_image", + "svg": "_file_svg", + "eps": "_file_svg", + "ai": "_file_ai", "ico": "_file_image", "tif": "_file_image", "tiff": "_file_image", @@ -371,6 +422,9 @@ "bzip2": "_file_zip", "gzip": "_file_zip", "7z": "_file_zip", + "7zip": "_file_zip", + "pzip": "_file_zip", + "wim": "_file_zip", "rar": "_file_zip", "tgz": "_file_zip", "exe": "_file_exe", @@ -392,6 +446,8 @@ "sh": "_file_console", "bat": "_file_console", "ps1": "_file_console", + "fish": "_file_console", + "bash": "_file_console", "gradle": "_file_gradle", "doc": "_file_word", "docx": "_file_word", @@ -524,9 +580,11 @@ "mli": "_file_ocaml", "cmx": "_file_ocaml", "js.map": "_file_jsmap", - "css.map": "_file_cssmap" + "css.map": "_file_cssmap", + "tmTheme": "_file_markup" }, "fileNames": { + "gruntfile.js": "_file_grunt", "bower.json": "_file_bower", "webpack.js": "_file_webpack", "webpack.config.js": "_file_webpack", @@ -544,25 +602,21 @@ ".jscsrc": "_file_json", ".jshintrc": "_file_json", ".jshintignore": "_file_settings", - ".npmignore": "_file_nodejs", + ".npmignore": "_file_npm", "tsconfig.json": "_file_json", "tslint.json": "_file_json", "androidmanifest.xml": "_file_android", "gradle-wrapper.properties": "_file_gradle", ".editorconfig": "_file_settings", - "procfile": "_file_settings", + "procfile": "_file_procfile", ".env": "_file_tune", "dockerfile": "_file_docker", - "license": "_file_certificate", - "license.md": "_file_certificate", - "license.md.rendered": "_file_certificate", - "license.txt": "_file_certificate", - "licence": "_file_certificate", - "licence.md": "_file_certificate", - "licence.md.rendered": "_file_certificate", - "licence.txt": "_file_certificate", + "license": "_file_license", + "license.md": "_file_license", + "license.md.rendered": "_file_license", + "license.txt": "_file_license", ".babelrc": "_file_json", - ".eslintrc": "_file_json", + ".eslintrc": "_file_yaml", ".buildignore": "_file_settings", ".htaccess": "_file_xml", "composer.lock": "_file_json", @@ -597,7 +651,17 @@ }, "folderNames": { "node_modules": "_file_nodejs", - ".gulp": "_file_gulp" + ".git": "_file_git", + ".github": "_file_github", + ".gulp": "_file_gulp", + "bower_components": "_file_bower" + }, + "folderNamesExpanded": { + "node_modules": "_file_nodejs", + ".git": "_file_git", + ".github": "_file_github", + ".gulp": "_file_gulp", + "bower_components": "_file_bower" }, "languageIds": { "git": "_file_git" diff --git a/test/source.swig b/test/source.swig new file mode 100644 index 0000000..e69de29