Merge branch 'develop'

.vscodeignore

@@ -4,7 +4,11 @@ out/test/**
 test/**
 src/**
 **/*.map
+.gulp
+.github
 .gitignore
 tsconfig.json
 vsc-extension-quickstart.md
 node_modules
+gulpfile.babel.json
+yarn.lock

CHANGELOG.md

@@ -1,9 +1,19 @@
-<a name="0.0.3"></a>
+<a name="0.0.4"></a>
-## 0.0.3 (2017-02-07)
+## 0.0.4 (2017-02-09)
+
+
+### 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))
 
 
 ### 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))
 

README.md

@@ -2,4 +2,4 @@
 # Material Theme β for Visual Studio Code
 ### Beta (β) release
 
-The most epic theme, Material Theme, meet Visual Studio Code. If you have problems, first search for a similiar issue and then report a new one.
+The most epic theme meet Visual Studio Code. If you have problems, first search for a similiar issue and then report a new one.

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.3",
+  "version": "0.0.4",
   "publisher": "Equinusocio",
   "license": "Apache-2.0",
   "icon": "logo.png",
@@ -37,6 +37,11 @@
         "label": "Material Theme Darker",
         "uiTheme": "vs-dark",
         "path": "./themes/Material-Theme-Darker.tmTheme"
+      },
+      {
+        "label": "Material Theme Lighter",
+        "uiTheme": "vs",
+        "path": "./themes/Material-Theme-Lighter.tmTheme"
       }
     ],
     "iconThemes": [

src/icons/folder-outline.svg

@@ -5,7 +5,7 @@
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 24 24"
 	 style="enable-background:new 0 0 24 24;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#59595A;}
+	.st0{fill:#80CBC4;}
 </style>
 <sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview6" inkscape:current-layer="svg2" inkscape:cx="12" inkscape:cy="11.79661" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="705" inkscape:window-maximized="1" inkscape:window-width="1366" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:zoom="9.8333333" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
 	</sodipodi:namedview>

src/icons/json.svg

@@ -1,54 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32">
-<svg
+  <g fill="none" fill-rule="evenodd" transform="translate(4 1)">
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+    <path fill="#AA759F" d="M0.0628166706,13.2355553 L0.0628166706,15.767821 C2.33265991,15.872488 2.53720974,17.1386209 2.53720974,17.9827094 C2.53720974,18.826798 2.43493483,19.6708866 2.32936072,20.6196421 C2.22708581,21.4637307 2.22708581,22.4124863 2.22708581,23.2565748 C2.22708581,26.5282621 4.18680512,27.689728 7.07359704,27.689728 L8.20851866,27.689728 L8.20851866,24.944752 L7.6938449,24.944752 C6.14652444,24.944752 5.63185068,23.9959964 5.63185068,22.5171532 C5.63185068,21.990442 5.73412559,21.3556874 5.83969969,20.7243091 C5.94197461,19.9848875 6.04754871,19.2454659 6.04754871,18.4013774 C6.04754871,15.8691117 5.014902,14.9203561 3.26303171,14.4983118 L3.26303171,14.3936448 C5.014902,14.0762675 6.04754871,13.127512 6.04754871,10.5952463 C6.04754871,9.75115771 5.9452738,9.01173612 5.83969969,8.38035787 C5.73742478,7.64093628 5.63185068,7.00955803 5.63185068,6.47947041 C5.63185068,5.00062724 6.14652444,4.05187168 7.6938449,4.05187168 L8.20851866,4.05187168 L8.20851866,1.30689566 L7.07359704,1.30689566 C4.08453021,1.30689566 2.22708581,2.67769549 2.22708581,5.74004882 C2.22708581,6.58413739 2.22708581,7.42822596 2.32936072,8.37698152 C2.43163564,9.22107009 2.53720974,10.1698256 2.53720974,10.9092472 C2.53720974,11.9660461 2.32936072,13.1241356 0.0628166706,13.232179 L0.0628166706,13.2355553 Z"/>
-   xmlns:cc="http://creativecommons.org/ns#"
+    <path fill="#90A959" d="M25.0112972,15.767821 L25.0112972,13.2355553 C22.8470281,13.1308883 22.5369041,11.9694225 22.5369041,10.9126236 C22.5369041,10.173202 22.6391791,9.22444644 22.7447532,8.38035787 C22.8470281,7.43160232 22.9526022,6.58751375 22.9526022,5.74342518 C22.9526022,2.6844482 20.9928829,1.31027201 18.003816,1.31027201 L16.8688944,1.31027201 L16.8688944,4.05524804 L17.3835682,4.05524804 C18.9308886,4.15991502 19.4455624,5.00400359 19.4455624,6.48284676 C19.4455624,7.00955803 19.3432875,7.64431264 19.2377134,8.38373422 C19.1354385,9.01848883 19.0298644,9.75453406 19.0298644,10.5986226 C19.0298644,13.1308883 20.0625111,14.0796439 21.8143814,14.3970212 L21.8143814,14.5016882 C20.0625111,14.9237325 19.0298644,15.872488 19.0298644,18.4047537 C19.0298644,19.2488423 19.1321393,19.9882639 19.2377134,20.7276855 C19.3399883,21.3624401 19.4455624,21.9938183 19.4455624,22.5205296 C19.4455624,23.9993728 18.9308886,24.9481283 17.3835682,24.9481283 L16.8688944,24.9481283 L16.8688944,27.6931043 L18.003816,27.6931043 C20.890608,27.6931043 22.9526022,26.5316385 22.9526022,23.2599512 C22.9526022,22.4158626 22.8503273,21.4671071 22.7447532,20.6230185 C22.6424782,19.6742629 22.5369041,18.8301744 22.5369041,17.9860858 C22.5369041,17.1419972 22.8470281,15.8758644 25.0112972,15.7711974 L25.0112972,15.767821 Z"/>
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  </g>
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="json.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="729"
-     inkscape:window-height="480"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="11.898305"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M5,3H7V5H5V10A2,2 0 0,1 3,12A2,2 0 0,1 5,14V19H7V21H5C3.93,20.73 3,20.1 3,19V15A2,2 0 0,0 1,13H0V11H1A2,2 0 0,0 3,9V5A2,2 0 0,1 5,3M19,3A2,2 0 0,1 21,5V9A2,2 0 0,0 23,11H24V13H23A2,2 0 0,0 21,15V19A2,2 0 0,1 19,21H17V19H19V14A2,2 0 0,1 21,12A2,2 0 0,1 19,10V5H17V3H19M12,15A1,1 0 0,1 13,16A1,1 0 0,1 12,17A1,1 0 0,1 11,16A1,1 0 0,1 12,15M8,15A1,1 0 0,1 9,16A1,1 0 0,1 8,17A1,1 0 0,1 7,16A1,1 0 0,1 8,15M16,15A1,1 0 0,1 17,16A1,1 0 0,1 16,17A1,1 0 0,1 15,16A1,1 0 0,1 16,15Z"
-     id="path4"
-     style="fill:#F4BF75;fill-opacity:1" />
 </svg>

src/material-theme-icons.json

@@ -1,5 +1,8 @@
 {
   "iconDefinitions": {
+    "_file_bower": {
+      "iconPath": "./icons/bower.svg"
+    },
     "_file_json": {
       "iconPath": "./icons/json.svg"
     },
@@ -524,6 +527,7 @@
     "css.map": "_file_cssmap"
   },
   "fileNames": {
+    "bower.json": "_file_bower",
     "webpack.js": "_file_webpack",
     "webpack.config.js": "_file_webpack",
     "webpack.dev.js": "_file_webpack",

test/shell.bash

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "$RANDOM"  # Supported in bash. No warnings.

test/shell.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "$RANDOM"  # Unsupported in sh. Produces warning.

test/source.jsx

@@ -0,0 +1 @@
+//