Merge branch 'develop'

extensions/defaults.json

@@ -18,7 +18,7 @@
     "Yellow": "#FFA000"
   },
   "changelog": {
-    "lastversion": "1.0.2"
+    "lastversion": "1.0.3"
   },
   "icons": {
     "theme": {

icons/dotnet.svg

@@ -0,0 +1 @@
+<svg width="33" height="32" viewBox="0 0 33 32" xmlns="http://www.w3.org/2000/svg"><title>dotnet</title><path d="M8.678 18.464H5.402L4.952 20h-2.94l3.498-9.306h3.136L12.144 20h-3.01l-.456-1.536zm-.603-2.012l-1.029-3.346-1.022 3.346h2.05zm4.488.47l2.735-.172c.06.444.18.783.362 1.016.296.376.72.565 1.27.565.41 0 .726-.097.949-.29.222-.192.333-.415.333-.669 0-.241-.106-.457-.317-.647-.212-.19-.703-.37-1.473-.54-1.261-.283-2.16-.66-2.698-1.13-.542-.47-.812-1.068-.812-1.796 0-.478.138-.93.415-1.355.278-.426.694-.76 1.25-1.003.557-.244 1.32-.365 2.29-.365 1.188 0 2.095.22 2.72.663.623.442.995 1.146 1.113 2.11l-2.71.16c-.072-.42-.223-.724-.454-.915-.23-.19-.55-.285-.955-.285-.335 0-.587.07-.756.212a.652.652 0 0 0-.254.518c0 .148.07.28.21.4.135.122.457.236.965.342 1.256.271 2.157.545 2.7.822.544.277.94.621 1.188 1.032.247.41.37.87.37 1.377a2.95 2.95 0 0 1-.494 1.65c-.33.504-.792.886-1.384 1.146-.592.26-1.34.39-2.24.39-1.583 0-2.68-.304-3.289-.913-.61-.61-.954-1.384-1.034-2.324zm9.876-6.228h4.78c1.041 0 1.821.248 2.34.743.518.495.777 1.2.777 2.114 0 .94-.283 1.673-.847 2.202-.565.53-1.428.794-2.587.794h-1.574V20h-2.889v-9.306zm2.889 3.968h.704c.555 0 .944-.097 1.168-.29a.93.93 0 0 0 .337-.739c0-.292-.098-.54-.292-.742-.195-.204-.561-.305-1.099-.305h-.818v2.076z" fill="#6A9FB5" fill-rule="evenodd"/></svg>

icons/node.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><title>node</title><path d="M15.994 29c-.18 0-.358-.028-.537-.083a2.471 2.471 0 0 1-.502-.219l-3.318-1.94c-.246-.134-.341-.234-.286-.301a.417.417 0 0 1 .185-.135c.335-.112.58-.2.738-.268a8.99 8.99 0 0 0 .77-.403.292.292 0 0 1 .135-.034c.046 0 .08.012.1.034l2.55 1.506c.044.022.1.034.167.034s.112-.012.135-.034l9.921-5.687c.045-.044.084-.09.118-.135a.213.213 0 0 0 .05-.135V9.76a.302.302 0 0 0-.05-.15.291.291 0 0 0-.118-.118l-9.887-5.686a.343.343 0 0 0-.184-.067.207.207 0 0 0-.15.067L5.944 9.49a.31.31 0 0 0-.118.118.276.276 0 0 0-.05.15V21.2c0 .045.017.09.05.135.032.046.072.09.118.135l2.715 1.54c.738.38 1.32.418 1.744.117.425-.3.637-.674.637-1.12V10.734c0-.067.028-.128.084-.184a.256.256 0 0 1 .185-.084h1.274c.067 0 .128.028.184.084a.256.256 0 0 1 .084.184v11.275c0 .982-.252 1.745-.755 2.29-.504.546-1.224.819-2.162.82a4.89 4.89 0 0 1-.889-.083c-.301-.056-.765-.24-1.39-.552L5.04 23.01a2.324 2.324 0 0 1-.755-.786A1.98 1.98 0 0 1 4 21.203V9.76c0-.357.095-.697.285-1.021.19-.324.442-.586.755-.786l9.922-5.686A2.06 2.06 0 0 1 16 2c.379 0 .725.09 1.038.268l9.922 5.686c.313.201.564.463.755.786.19.322.285.663.285 1.021v11.442c0 .356-.095.697-.285 1.02-.19.325-.442.587-.755.787l-9.922 5.686c-.156.09-.323.163-.502.218a1.795 1.795 0 0 1-.536.084l-.006.002zm3.05-7.862c-2.168 0-3.582-.402-4.241-1.205-.66-.804-.989-1.629-.989-2.475 0-.067.028-.129.084-.184a.256.256 0 0 1 .184-.084h1.307a.29.29 0 0 1 .184.067c.056.044.084.1.084.167.09.646.352 1.137.787 1.473.435.335 1.3.502 2.598.5 1.05 0 1.81-.128 2.28-.385.47-.257.705-.663.704-1.22 0-.313-.179-.586-.537-.82-.357-.234-1.34-.429-2.95-.585-1.362-.134-2.435-.401-3.217-.802-.782-.402-1.173-1.149-1.173-2.242 0-1.003.397-1.784 1.19-2.342.794-.558 1.894-.837 3.302-.837 1.586 0 2.781.279 3.586.837.806.558 1.264 1.428 1.375 2.61 0 .044-.005.089-.017.134a.214.214 0 0 1-.05.101 1.663 1.663 0 0 0-.117.066.233.233 0 0 1-.118.035h-1.274a.29.29 0 0 1-.185-.067.205.205 0 0 1-.083-.167c-.156-.69-.458-1.164-.906-1.421-.447-.257-1.184-.386-2.211-.386-1.14 0-1.85.157-2.128.47-.28.312-.419.613-.419.903 0 .357.185.618.554.785.369.167 1.324.352 2.866.553 1.52.201 2.648.502 3.385.903.736.401 1.105 1.137 1.107 2.208.001 1.07-.43 1.907-1.292 2.509-.862.602-2.085.903-3.67.903v-.002z" fill="#90A959" fill-rule="evenodd"/></svg>

logo.svg

@@ -1,38 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="0 0 120 120">
-  <style>
-    .MT-Circle {
-      animation: BackgroundAccent 30s infinite;
-    }
-
-    .MT-Logo {
-      animation: Pulse 5s infinite cubic-bezier(0.0, 0.0, 0.2, 1);
-      transform-origin: 50% 50%;
-    }
-
-    @keyframes Pulse {
-      0% { transform:; }
-      50% { transform: scale(0.9); }
-      100% { transform: none; }
-    }
-
-    @keyframes BackgroundAccent {
-      7% { fill: #7CB342; }
-      14% { fill: #2979FF; }
-      21% { fill: #64FFDA; }
-      35% { fill: #00BCD4; }
-      42% { fill: #5C6BC0; }
-      49% { fill: #616161; }
-      56% { fill: #FF4081; }
-      63% { fill: #AB47BC; }
-      63% { fill: #E57373; }
-      70% { fill: #F44336; }
-      77% { fill: #80CBC4; }
-      84% { fill: #FFA000; }
-      100% { fill: #864BFF; }
-    }
-  </style>
-  <g fill="none" fill-rule="evenodd">
-    <circle class="MT-Circle" cx="60" cy="60" r="60" fill="#864BFF"/>
-    <path class="MT-Logo" fill="#FFFFFF" fill-rule="nonzero" d="M93.9938159,32.3429636 L94,87.6817446 L77.8110306,94 L49.4613614,67.1273394 L32.4452657,79.778023 L26,76.6201548 L26.0064755,43.4168848 L32.4820627,40.2361541 L49.5120974,52.8973674 L77.7922029,26 L93.9938159,32.3429636 Z M75.9937441,48 L60,59.9531397 L76,72 L75.9937441,48 Z M34,53 L34.0096057,67 L42,59.952687 L34,53 Z"/>
-  </g>
-</svg>

package.json

@@ -5,7 +5,7 @@
   "version": "1.0.3",
   "publisher": "Equinusocio",
   "license": "Apache-2.0",
-  "icon": "logo.svg",
+  "icon": "logo.png",
   "galleryBanner": {
     "color": "#263238",
     "theme": "dark"
@@ -19,7 +19,7 @@
     "url": "https://github.com/equinusocio/vsc-material-theme/issues"
   },
   "engines": {
-    "vscode": "^1.12.0"
+    "vscode": "^1.17.0"
   },
   "scripts": {
     "build": "npm run build-icons && npm run build-themes && npm run build-icons-accents && npm run build-icons-variants",

src/icons/partials/fileExtensions.js

@@ -1,4 +1,8 @@
 "fileExtensions": {
+  "mjs": "_file_node",
+  "asp": "_file_dotnet",
+  "aspx": "_file_dotnet",
+  "ascx": "_file_dotnet",
   "cmd": "_file_cmd",
   "mustache": "_file_mustache",
   "rails": "_file_rails",

src/icons/svgs/dotnet.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="33px" height="32px" viewBox="0 0 33 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>dotnet</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons-Table" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="dotnet" fill="#6A9FB5">
+            <path d="M8.67773438,18.4638672 L5.40234375,18.4638672 L4.95166016,20 L2.01269531,20 L5.51025391,10.6943359 L8.64599609,10.6943359 L12.1435547,20 L9.13476562,20 L8.67773438,18.4638672 Z M8.07470703,16.4516602 L7.04638672,13.1064453 L6.02441406,16.4516602 L8.07470703,16.4516602 Z M12.5625,16.9213867 L15.2983398,16.75 C15.3575849,17.1943382 15.4781892,17.5328764 15.6601562,17.765625 C15.9563817,18.1422545 16.3795545,18.3305664 16.9296875,18.3305664 C17.3401713,18.3305664 17.656493,18.2342946 17.8786621,18.041748 C18.1008312,17.8492015 18.2119141,17.6259778 18.2119141,17.3720703 C18.2119141,17.1308582 18.1061208,16.91504 17.8945312,16.7246094 C17.6829417,16.5341787 17.1920611,16.3543303 16.421875,16.1850586 C15.160801,15.9015285 14.2615587,15.5249047 13.7241211,15.0551758 C13.1824517,14.5854469 12.9116211,13.9866573 12.9116211,13.2587891 C12.9116211,12.7805966 13.0502102,12.3288595 13.3273926,11.9035645 C13.604575,11.4782694 14.0214002,11.1439628 14.5778809,10.9006348 C15.1343615,10.6573067 15.8971306,10.5356445 16.8662109,10.5356445 C18.0553445,10.5356445 18.9619923,10.7567523 19.5861816,11.1989746 C20.210371,11.6411969 20.5817051,12.3447217 20.7001953,13.3095703 L17.9897461,13.4682617 C17.9178056,13.0493143 17.7665213,12.7446299 17.5358887,12.5541992 C17.305256,12.3637686 16.9868184,12.2685547 16.5805664,12.2685547 C16.2462548,12.2685547 15.994467,12.3394361 15.8251953,12.4812012 C15.6559236,12.6229662 15.5712891,12.7954091 15.5712891,12.9985352 C15.5712891,13.1466479 15.6411126,13.2799473 15.7807617,13.3984375 C15.9161791,13.5211595 16.2377904,13.6354161 16.7456055,13.7412109 C18.0024477,14.0120456 18.9027479,14.28605 19.4465332,14.5632324 C19.9903185,14.8404148 20.3859851,15.1842427 20.6335449,15.5947266 C20.8811048,16.0052104 21.0048828,16.4643529 21.0048828,16.972168 C21.0048828,17.5688506 20.8398454,18.1189753 20.5097656,18.6225586 C20.1796858,19.1261418 19.7184274,19.5080553 19.1259766,19.7683105 C18.5335257,20.0285658 17.7866256,20.1586914 16.8852539,20.1586914 C15.3025637,20.1586914 14.206546,19.854007 13.597168,19.2446289 C12.9877899,18.6352509 12.642904,17.8608445 12.5625,16.9213867 Z M22.4394531,10.6943359 L27.2192383,10.6943359 C28.2602591,10.6943359 29.0399551,10.9418921 29.5583496,11.4370117 C30.0767441,11.9321314 30.3359375,12.6367142 30.3359375,13.5507812 C30.3359375,14.4902391 30.0534696,15.224444 29.4885254,15.753418 C28.9235812,16.282392 28.0613665,16.546875 26.9018555,16.546875 L25.3276367,16.546875 L25.3276367,20 L22.4394531,20 L22.4394531,10.6943359 Z M25.3276367,14.6616211 L26.0322266,14.6616211 C26.5865913,14.6616211 26.9759103,14.5653493 27.2001953,14.3728027 C27.4244803,14.1802562 27.5366211,13.933758 27.5366211,13.6333008 C27.5366211,13.3413071 27.4392913,13.093751 27.2446289,12.890625 C27.0499665,12.687499 26.683922,12.5859375 26.1464844,12.5859375 L25.3276367,12.5859375 L25.3276367,14.6616211 Z" id="ASP"></path>
+        </g>
+    </g>
+</svg>

src/themes/theme-template-color-theme.json

@@ -714,7 +714,7 @@
     "tab.activeBorder": "{{commons.accents.Teal}}",
     "tab.unfocusedActiveBorder": "{{variant.scheme.comments}}",
     "tab.activeForeground": "{{variant.scheme.tabActiveForeground}}",
-    "tab.inactiveForeground": "{{variant.scheme.comments}}",
+    "tab.inactiveForeground": "{{variant.scheme.sidebarForeground}}",
     "tab.inactiveBackground": "{{variant.scheme.background}}",
     "tab.unfocusedActiveForeground": "{{variant.scheme.foreground}}",
     "tab.border": "{{variant.scheme.background}}",

themes/Material-Theme-Darker.json

@@ -714,7 +714,7 @@
     "tab.activeBorder": "#80CBC4",
     "tab.unfocusedActiveBorder": "#4A4A4A",
     "tab.activeForeground": "#FFFFFF",
-    "tab.inactiveForeground": "#4A4A4A",
+    "tab.inactiveForeground": "#616161",
     "tab.inactiveBackground": "#212121",
     "tab.unfocusedActiveForeground": "#EEFFFF",
     "tab.border": "#212121",

themes/Material-Theme-Lighter.json

@@ -714,7 +714,7 @@
     "tab.activeBorder": "#80CBC4",
     "tab.unfocusedActiveBorder": "#90A4AE90",
     "tab.activeForeground": "#000000",
-    "tab.inactiveForeground": "#90A4AE90",
+    "tab.inactiveForeground": "#7E939E",
     "tab.inactiveBackground": "#FAFAFA",
     "tab.unfocusedActiveForeground": "#90A4AE",
     "tab.border": "#FAFAFA",