Merge branch 'develop'

.npmrc

@@ -0,0 +1,4 @@
+git-tag-version = false
+tag-version-prefix =
+save-exact = true
+progress = true

.yarnrc

@@ -0,0 +1,2 @@
+save-exact true
+save-prefix false

CHANGELOG.md

@@ -1,3 +1,21 @@
+<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)
+
+
+### Bug Fixes
+
+* Fix brackets color (punctuation.class...). Fix [#76](https://github.com/equinusocio/vsc-material-theme/issues/76) ([767ea73](https://github.com/equinusocio/vsc-material-theme/commit/767ea73))
+* Fix wrong gutter indicator for add line. Close 89 ([a605ec9](https://github.com/equinusocio/vsc-material-theme/commit/a605ec9))
+* Update gutter line colors. Fix [#79](https://github.com/equinusocio/vsc-material-theme/issues/79) ([6cf67be](https://github.com/equinusocio/vsc-material-theme/commit/6cf67be))
+
+
+### Features
+
+* Add tab active bottom border ([a5a392a](https://github.com/equinusocio/vsc-material-theme/commit/a5a392a)), closes [#88](https://github.com/equinusocio/vsc-material-theme/issues/88)
+* Adds "show changelog" command. ([840d174](https://github.com/equinusocio/vsc-material-theme/commit/840d174))
+
+
+
 <a name="1.0.2"></a>
 ## [1.0.2](https://github.com/equinusocio/vsc-material-theme/compare/v1.0.1...v1.0.2) (2017-07-25)
 

README.md

@@ -52,7 +52,9 @@ Launch *Quick Open*,
   - <img src="https://developer.apple.com/favicon.ico" width=16 height=16/> <a href="https://code.visualstudio.com/shortcuts/keyboard-shortcuts-macos.pdf">macOS</a> `Shift+⌘+P`
   - <img src="https://www.microsoft.com/favicon.ico" width=16 height=16/> <a href="https://code.visualstudio.com/shortcuts/keyboard-shortcuts-windows.pdf">Windows</a> `Ctrl+P`
 
-Type `Material Theme` and choose `Material Theme: Settings`, then select `Change color variant` and pick one theme from the list.
+Type `theme` anc choose `Preferences: Color Theme`, then select Material Theme from the list.
+
+This theme provide differents color variants, to change the active theme variant type `Material Theme` and choose `Material Theme: Settings`, then select `Change color variant` and pick one theme from the list.
 
 ## Activate File Icons
 

extensions/commands/accents-setter/index.ts

@@ -46,6 +46,10 @@ let accentsProperties: IGenericObject<IAccentCustomProperty> = {
   "pickerGroup.foreground": {
     alpha: 100,
     value: undefined
+  },
+  "tab.activeBorder": {
+    alpha: 100,
+    value: undefined
   }
 }
 

extensions/defaults.json

@@ -17,6 +17,9 @@
     "Teal": "#80CBC4",
     "Yellow": "#FFA000"
   },
+  "changelog": {
+    "lastversion": "1.0.2"
+  },
   "icons": {
     "theme": {
       "iconDefinitions": {

extensions/helpers/changelog.ts

@@ -0,0 +1,61 @@
+import * as path from 'path';
+import * as vscode from 'vscode';
+
+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'));
+
+  vscode.commands.executeCommand('markdown.showPreview', uri);
+
+}
+
+function splitVersion(input: string): { major: number, minor: number, patch: number } {
+  let [ major, minor, patch ] = input.split('.').map(i => parseInt(i));
+  return { major, minor, patch };
+}
+
+export function showChangelog(): void {
+  let extname: string = 'Microsoft.vscode-markdown';
+  let md = vscode.extensions.getExtension<any>(extname);
+
+  if (md === undefined) {
+    console.warn(`Ext not found ${ extname }`)
+    return;
+  }
+
+  if (md.isActive) {
+    previewFile();
+  } else {
+    md.activate().then(() => {
+      previewFile();
+    }, reason => {
+      console.warn(reason);
+    });
+  }
+}
+
+export function shouldShowChangelog(): boolean {
+  let defaults = getDefaultValues();
+  let out: boolean;
+  let packageJSON = getPackageJSON();
+
+  if (defaults.changelog == undefined || (defaults.changelog !== undefined && typeof defaults.changelog.lastversion !== 'string')) {
+    defaults.changelog = {
+      lastversion: packageJSON.version
+    }
+    out = true;
+  } else {
+    let versionCurrent = splitVersion(packageJSON.version);
+    let versionOld = splitVersion(defaults.changelog.lastversion);
+
+    out = versionCurrent.major > versionOld.major || versionCurrent.minor > versionOld.minor || versionCurrent.patch > versionOld.patch;
+
+    defaults.changelog.lastversion = packageJSON.version;
+  }
+
+  writeFile(path.join('./extensions/defaults.json'), JSON.stringify(defaults, null, 2));
+
+  return out;
+}

extensions/interfaces/idefaults.ts

@@ -1,5 +1,6 @@
 export interface IDefaults {
   accents: IAccents;
+  changelog: IChangelog;
   icons: IDefaultsThemeIcons;
   themeVariants: IDefaultsThemeVariant;
   themeVariantsColours: IDefaultsThemeVariantColours;
@@ -11,6 +12,10 @@ export interface IAccents {
   [index: string]: string;
 }
 
+export interface IChangelog {
+  lastversion: string;
+}
+
 export interface IDefaultsThemeIcons {
   theme: {
     iconDefinitions: {

extensions/material.theme.config.ts

@@ -3,15 +3,18 @@ import * as vscode from 'vscode';
 import { IGenericObject } from "./interfaces/igeneric-object";
 import { THEME_ACCENTS_SETTER } from "./commands/accents-setter/index";
 import { THEME_VARIANT } from "./commands/theme-variant/index";
+import { shouldShowChangelog, showChangelog } from './helpers/changelog';
 
 enum Commands {
   ACCENTS,
+  CHANGELOG,
   COLOUR_VARIANT
 }
 
 const OPTIONS: IGenericObject<number> = {
   'Change accent color': Commands.ACCENTS,
-  'Change color variant': Commands.COLOUR_VARIANT
+  'Change color variant': Commands.COLOUR_VARIANT,
+  'Show changelog': Commands.CHANGELOG
 }
 
 export function activate(context: vscode.ExtensionContext) {
@@ -19,6 +22,10 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.workspace.getConfiguration().update('materialTheme.cache.workbench.accent', undefined, true);
   }
 
+  if (shouldShowChangelog()) {
+    showChangelog();
+  }
+
   // registering the command
   let command = vscode.commands.registerCommand('material.theme.config', () => {
     // the user is going to choose what aspect of theme to config
@@ -28,6 +35,9 @@ export function activate(context: vscode.ExtensionContext) {
         case Commands.ACCENTS:
           THEME_ACCENTS_SETTER();
         break;
+        case Commands.CHANGELOG:
+          showChangelog();
+        break;
         case Commands.COLOUR_VARIANT:
           THEME_VARIANT();
         break;

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.2",
+  "version": "1.0.3",
   "publisher": "Equinusocio",
   "license": "Apache-2.0",
   "icon": "logo.png",
@@ -71,7 +71,7 @@
       {
         "label": "Material Theme",
         "uiTheme": "vs-dark",
-        "path": "./themes/Material-Theme-Default.json"
+        "path": "./themes/Material-Theme-Palenight.json"
       }
     ],
     "iconThemes": [
@@ -90,32 +90,32 @@
     }
   ],
   "devDependencies": {
-    "@types/chalk": "^0.4.31",
+    "@types/chalk": "0.4.31",
     "@types/gulp": "4.0.4",
     "@types/gulp-if": "0.0.31",
-    "@types/gulp-util": "^3.0.31",
+    "@types/gulp-util": "3.0.31",
-    "@types/mustache": "^0.8.29",
+    "@types/mustache": "0.8.29",
     "@types/run-sequence": "0.0.29",
-    "@types/through2": "^2.0.33",
+    "@types/through2": "2.0.33",
-    "@types/yamljs": "^0.2.30",
+    "@types/yamljs": "0.2.30",
-    "@types/yargs": "^6.6.0",
+    "@types/yargs": "6.6.0",
     "babel-core": "6.25.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-es2015": "6.24.1",
-    "babel-root-import": "^4.1.8",
+    "babel-root-import": "4.1.8",
-    "cpx": "^1.5.0",
+    "cpx": "1.5.0",
     "eslint": "4.1.1",
-    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-standard": "3.0.1",
-    "gulp": "^3.9.1",
+    "gulp": "3.9.1",
-    "gulp-bump": "^2.7.0",
+    "gulp-bump": "2.7.0",
-    "gulp-conventional-changelog": "^1.1.3",
+    "gulp-conventional-changelog": "1.1.3",
-    "gulp-if": "^2.0.2",
+    "gulp-if": "2.0.2",
-    "gulp-stats": "^0.0.4",
+    "gulp-stats": "0.0.4",
-    "gulp-util": "^3.0.8",
+    "gulp-util": "3.0.8",
-    "json-minify": "^1.0.0",
+    "json-minify": "1.0.0",
-    "mustache": "^2.3.0",
+    "mustache": "2.3.0",
-    "rimraf": "^2.6.1",
+    "rimraf": "2.6.1",
-    "run-sequence": "^1.2.2",
+    "run-sequence": "1.2.2",
-    "svgo": "^0.7.1",
+    "svgo": "0.7.1",
     "typescript": "2.4.1",
     "vscode": "1.1.1",
     "yamljs": "0.3.0",

src/icons/partials/fileExtensions.js

@@ -267,5 +267,6 @@
   "pp": "_file_pp",
   "applescript": "_file_applescript",
   "haml": "_file_haml",
-  "ex": "_file_ex"
+  "ex": "_file_ex",
-},
+  "exs": "_file_ex"
+},

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

@@ -649,8 +649,7 @@
       "name": "Markdown - Fenced Bode Block Variable",
       "scope": [
         "markup.raw.block.fenced.markdown",
-        "variable.language.fenced.markdown",
+        "variable.language.fenced.markdown"
-        "punctuation.section.class.end"
       ],
       "settings": {
         "foreground": "{{variant.scheme.foreground}}"
@@ -709,9 +708,11 @@
     "editorIndentGuide.background": "{{variant.scheme.guides}}",
     "editorGroupHeader.tabsBackground": "{{variant.scheme.background}}",
     "editorGroup.border": "{{variant.scheme.shadow}}",
-    "editorGutter.modifiedBackground": "{{variant.scheme.base.yellow}}40",
+    "editorGutter.modifiedBackground": "{{variant.scheme.base.blue}}60",
-    "editorGutter.addedBackground": "{{variant.scheme.base.green}40",
+    "editorGutter.addedBackground": "{{variant.scheme.base.green}}60",
-    "editorGutter.deletedBackground": "{{variant.scheme.base.red}}40",
+    "editorGutter.deletedBackground": "{{variant.scheme.base.red}}60",
+    "tab.activeBorder": "{{commons.accents.Teal}}",
+    "tab.unfocusedActiveBorder": "{{variant.scheme.comments}}",
     "tab.activeForeground": "{{variant.scheme.tabActiveForeground}}",
     "tab.inactiveForeground": "{{variant.scheme.comments}}",
     "tab.inactiveBackground": "{{variant.scheme.background}}",

themes/Material-Theme-Darker.json

@@ -649,8 +649,7 @@
       "name": "Markdown - Fenced Bode Block Variable",
       "scope": [
         "markup.raw.block.fenced.markdown",
-        "variable.language.fenced.markdown",
+        "variable.language.fenced.markdown"
-        "punctuation.section.class.end"
       ],
       "settings": {
         "foreground": "#EEFFFF"
@@ -709,8 +708,11 @@
     "editorIndentGuide.background": "#42424270",
     "editorGroupHeader.tabsBackground": "#212121",
     "editorGroup.border": "#00000030",
-    "editorGutter.modifiedBackground": "#FFCB6B40",
+    "editorGutter.modifiedBackground": "#82AAFF60",
-    "editorGutter.addedBackground": "40",
+    "editorGutter.addedBackground": "#C3E88D60",
+    "editorGutter.deletedBackground": "#FF537060",
+    "tab.activeBorder": "#80CBC4",
+    "tab.unfocusedActiveBorder": "#4A4A4A",
     "tab.activeForeground": "#FFFFFF",
     "tab.inactiveForeground": "#4A4A4A",
     "tab.inactiveBackground": "#212121",

themes/Material-Theme-Default.json

@@ -649,8 +649,7 @@
       "name": "Markdown - Fenced Bode Block Variable",
       "scope": [
         "markup.raw.block.fenced.markdown",
-        "variable.language.fenced.markdown",
+        "variable.language.fenced.markdown"
-        "punctuation.section.class.end"
       ],
       "settings": {
         "foreground": "#EEFFFF"
@@ -709,8 +708,11 @@
     "editorIndentGuide.background": "#37474F80",
     "editorGroupHeader.tabsBackground": "#263238",
     "editorGroup.border": "#00000030",
-    "editorGutter.modifiedBackground": "#FFCB6B40",
+    "editorGutter.modifiedBackground": "#82AAFF60",
-    "editorGutter.addedBackground": "40",
+    "editorGutter.addedBackground": "#C3E88D60",
+    "editorGutter.deletedBackground": "#FF537060",
+    "tab.activeBorder": "#80CBC4",
+    "tab.unfocusedActiveBorder": "#546E7A",
     "tab.activeForeground": "#FFFFFF",
     "tab.inactiveForeground": "#546E7A",
     "tab.inactiveBackground": "#263238",

themes/Material-Theme-Lighter.json

@@ -649,8 +649,7 @@
       "name": "Markdown - Fenced Bode Block Variable",
       "scope": [
         "markup.raw.block.fenced.markdown",
-        "variable.language.fenced.markdown",
+        "variable.language.fenced.markdown"
-        "punctuation.section.class.end"
       ],
       "settings": {
         "foreground": "#90A4AE"
@@ -709,8 +708,11 @@
     "editorIndentGuide.background": "#B0BEC570",
     "editorGroupHeader.tabsBackground": "#FAFAFA",
     "editorGroup.border": "#00000020",
-    "editorGutter.modifiedBackground": "#FFB62C40",
+    "editorGutter.modifiedBackground": "#6182B860",
-    "editorGutter.addedBackground": "40",
+    "editorGutter.addedBackground": "#91B85960",
+    "editorGutter.deletedBackground": "#E5393560",
+    "tab.activeBorder": "#80CBC4",
+    "tab.unfocusedActiveBorder": "#90A4AE90",
     "tab.activeForeground": "#000000",
     "tab.inactiveForeground": "#90A4AE90",
     "tab.inactiveBackground": "#FAFAFA",

themes/Material-Theme-Palenight.json

@@ -649,8 +649,7 @@
       "name": "Markdown - Fenced Bode Block Variable",
       "scope": [
         "markup.raw.block.fenced.markdown",
-        "variable.language.fenced.markdown",
+        "variable.language.fenced.markdown"
-        "punctuation.section.class.end"
       ],
       "settings": {
         "foreground": "#A6ACCD"
@@ -709,8 +708,11 @@
     "editorIndentGuide.background": "#4E557980",
     "editorGroupHeader.tabsBackground": "#292D3E",
     "editorGroup.border": "#00000030",
-    "editorGutter.modifiedBackground": "#FFCB6B40",
+    "editorGutter.modifiedBackground": "#82AAFF60",
-    "editorGutter.addedBackground": "40",
+    "editorGutter.addedBackground": "#C3E88D60",
+    "editorGutter.deletedBackground": "#FF537060",
+    "tab.activeBorder": "#80CBC4",
+    "tab.unfocusedActiveBorder": "#676E95",
     "tab.activeForeground": "#FFFFFF",
     "tab.inactiveForeground": "#676E95",
     "tab.inactiveBackground": "#292D3E",

yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@types/chalk@*", "@types/chalk@^0.4.31":
+"@types/chalk@*", "@types/chalk@0.4.31":
   version "0.4.31"
   resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-0.4.31.tgz#a31d74241a6b1edbb973cf36d97a2896834a51f9"
 
@@ -33,7 +33,7 @@
     "@types/node" "*"
     "@types/vinyl" "*"
 
-"@types/gulp-util@^3.0.31":
+"@types/gulp-util@3.0.31":
   version "3.0.31"
   resolved "https://registry.yarnpkg.com/@types/gulp-util/-/gulp-util-3.0.31.tgz#272e298220365717e1f7f979b50ebadb44297cbf"
   dependencies:
@@ -54,7 +54,7 @@
   version "2.0.29"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
 
-"@types/mustache@^0.8.29":
+"@types/mustache@0.8.29":
   version "0.8.29"
   resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.29.tgz#7a6f13e8f23ff5bcbaaec484888400b2a4427b41"
 
@@ -69,7 +69,7 @@
     "@types/gulp" "*"
     "@types/node" "*"
 
-"@types/through2@*", "@types/through2@^2.0.33":
+"@types/through2@*", "@types/through2@2.0.33":
   version "2.0.33"
   resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.33.tgz#1ff2e88a100dfb5b140e7bb98791f1194400d131"
   dependencies:
@@ -99,11 +99,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/yamljs@^0.2.30":
+"@types/yamljs@0.2.30":
   version "0.2.30"
   resolved "https://registry.yarnpkg.com/@types/yamljs/-/yamljs-0.2.30.tgz#d034e1d329e46e8d0f737c9a8db97f68f81b5382"
 
-"@types/yargs@^6.6.0":
+"@types/yargs@6.6.0":
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-6.6.0.tgz#91f8e2580a8083049f78311c059aa57d6949df6b"
 
@@ -635,7 +635,7 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-preset-es2015@^6.24.1:
+babel-preset-es2015@6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
   dependencies:
@@ -676,7 +676,7 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-root-import@^4.1.8:
+babel-root-import@4.1.8:
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/babel-root-import/-/babel-root-import-4.1.8.tgz#135bb83986d57d6f75ba9b7772b31633e22fbdac"
   dependencies:
@@ -1126,7 +1126,7 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cpx@^1.5.0:
+cpx@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f"
   dependencies:
@@ -1155,9 +1155,9 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-csso@~2.3.1:
+csso@~2.2.1:
-  version "2.3.2"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.2.1.tgz#51fbb5347e50e81e6ed51668a48490ae6fe2afe2"
   dependencies:
     clap "^1.0.9"
     source-map "^0.5.3"
@@ -1327,7 +1327,7 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-eslint-plugin-standard@^3.0.1:
+eslint-plugin-standard@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
 
@@ -1919,7 +1919,7 @@ growl@1.9.2:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
 
-gulp-bump@^2.7.0:
+gulp-bump@2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/gulp-bump/-/gulp-bump-2.7.0.tgz#4c3750bce93c5d816fe9a154e6619dd509a852d8"
   dependencies:
@@ -1937,7 +1937,7 @@ gulp-chmod@^2.0.0:
     stat-mode "^0.2.0"
     through2 "^2.0.0"
 
-gulp-conventional-changelog@^1.1.3:
+gulp-conventional-changelog@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.3.tgz#b88c69c29a2ad2dddfbedde9ded8b950a116f440"
   dependencies:
@@ -1963,7 +1963,7 @@ gulp-gunzip@0.0.3:
     through2 "~0.6.5"
     vinyl "~0.4.6"
 
-gulp-if@^2.0.2:
+gulp-if@2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/gulp-if/-/gulp-if-2.0.2.tgz#a497b7e7573005041caa2bc8b7dda3c80444d629"
   dependencies:
@@ -1997,7 +1997,7 @@ gulp-sourcemaps@1.6.0:
     through2 "^2.0.0"
     vinyl "^1.0.0"
 
-gulp-stats@^0.0.4:
+gulp-stats@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/gulp-stats/-/gulp-stats-0.0.4.tgz#f216c2bc079cb890cebf5d6aaa3b1eb397d12bab"
   dependencies:
@@ -2024,7 +2024,7 @@ gulp-untar@^0.0.6:
     tar "^2.2.1"
     through2 "~2.0.3"
 
-gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.8, gulp-util@~3.0.8:
+gulp-util@*, gulp-util@3.0.8, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@~3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies:
@@ -2059,7 +2059,7 @@ gulp-vinyl-zip@^1.4.0:
     yauzl "^2.2.1"
     yazl "^2.2.1"
 
-gulp@^3.9.1:
+gulp@3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
   dependencies:
@@ -2466,9 +2466,9 @@ js-yaml@^3.8.4:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
-js-yaml@~3.7.0:
+js-yaml@~3.6.1:
-  version "3.7.0"
+  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
@@ -2489,7 +2489,7 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-json-minify@^1.0.0:
+json-minify@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/json-minify/-/json-minify-1.0.0.tgz#4397e76f19688983352fcfbd5e2e5243fc0a07c8"
 
@@ -2935,7 +2935,7 @@ multipipe@^0.1.2:
   dependencies:
     duplexer2 "0.0.2"
 
-mustache@^2.3.0:
+mustache@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
 
@@ -3581,7 +3581,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+rimraf@2, rimraf@2.6.1, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
@@ -3593,7 +3593,7 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
-run-sequence@^1.2.2:
+run-sequence@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-1.2.2.tgz#5095a0bebe98733b0140bd08dd80ec030ddacdeb"
   dependencies:
@@ -3867,14 +3867,14 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-svgo@^0.7.1:
+svgo@0.7.1:
-  version "0.7.2"
+  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034"
   dependencies:
     coa "~1.0.1"
     colors "~1.1.2"
-    csso "~2.3.1"
+    csso "~2.2.1"
-    js-yaml "~3.7.0"
+    js-yaml "~3.6.1"
     mkdirp "~0.5.1"
     sax "~1.2.1"
     whet.extend "~0.9.9"