From df85fa577b41977466a85be486c102251d6e00aa Mon Sep 17 00:00:00 2001
From: jpellizzari <jordan@weave.works>
Date: Fri, 20 Jan 2017 09:30:39 -0800
Subject: [PATCH] Locked sass deps; fixed .matched-text fade function

---
 client/app/styles/main.scss         | 10 +++++-----
 client/package.json                 |  4 ++--
 client/webpack.local.config.js      |  4 ++--
 client/webpack.production.config.js |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/app/styles/main.scss b/client/app/styles/main.scss
index aa112969a..44977c5e1 100644
--- a/client/app/styles/main.scss
+++ b/client/app/styles/main.scss
@@ -70,7 +70,7 @@ $search-border-width: 1px;
 
 /* specific elements */
 $body-background-color: linear-gradient(30deg, $background-color 0%, $background-lighter-color 100%);
-$label-background-color: fade($background-average-color, 70%);
+$label-background-color: fade-out($background-average-color, .7);
 
 
 /* add this class to truncate text with ellipsis, container needs width */
@@ -197,7 +197,7 @@ h2 {
   bottom: 11px;
   right: 43px;
   color: $text-tertiary-color;
-  background-color: fade($background-average-color, 90%);
+  background-color: fade-out($background-average-color, .9);
   font-size: 0.7rem;
   display: flex;
 
@@ -578,7 +578,7 @@ h2 {
       display: inline-block;
       margin: 1px;
       padding: 2px 4px;
-      background-color: fade($weave-blue, 10%);
+      background-color: fade-out($weave-blue, .9);
     }
 
     &-label {
@@ -665,7 +665,7 @@ h2 {
   }
 
   .match {
-    background-color: fade($weave-blue, 30%);
+    background-color: fade-out($weave-blue, .7);
     border: 1px solid $weave-blue;
   }
 
@@ -1523,7 +1523,7 @@ h2 {
 }
 
 .search-item {
-  background-color: fade($weave-blue, 20%);
+  background-color: fade-out($weave-blue, .2);
   border-radius: $border-radius / 2;
   margin: 1px 0 1px 1.5em;
   display: inline-block;
diff --git a/client/package.json b/client/package.json
index b03357eae..6f6d797b3 100644
--- a/client/package.json
+++ b/client/package.json
@@ -65,13 +65,13 @@
     "immutable-devtools": "0.0.7",
     "jest-cli": "17.0.3",
     "json-loader": "0.5.4",
-    "node-sass": "^3.13.1",
+    "node-sass": "3.13.1",
     "postcss-loader": "1.2.0",
     "react-addons-perf": "15.4.1",
     "redux-devtools": "3.3.1",
     "redux-devtools-dock-monitor": "1.1.1",
     "redux-devtools-log-monitor": "1.1.1",
-    "sass-loader": "^4.1.1",
+    "sass-loader": "4.1.1",
     "style-loader": "0.13.1",
     "url": "0.11.0",
     "url-loader": "0.5.7",
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index b66d0f812..1994c44aa 100644
--- a/client/webpack.local.config.js
+++ b/client/webpack.local.config.js
@@ -82,7 +82,7 @@ module.exports = {
   module: {
     // Webpack is opionated about how pkgs should be laid out:
     // https://github.com/webpack/webpack/issues/1617
-    noParse: /xterm\/(.*).map$/,
+    noParse: [/xterm\/(.*).map$/, /xterm\/dist\/xterm\.js/],
     include: [
       path.resolve(__dirname, 'app/scripts', 'app/styles')
     ],
@@ -114,7 +114,7 @@ module.exports = {
       },
       {
         test: /\.(scss|css)$/,
-        loader: 'style-loader!css-loader!sass-loader'
+        loader: 'style-loader!css-loader!postcss-loader!sass-loader'
       }
     ]
   },
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 44997c749..c72802d2c 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -48,7 +48,7 @@ module.exports = {
   module: {
     // Webpack is opionated about how pkgs should be laid out:
     // https://github.com/webpack/webpack/issues/1617
-    noParse: [/xterm\/lib/],
+    noParse: [/xterm\/dist\/xterm\.js/],
     include: [
       path.resolve(__dirname, 'app/scripts', 'app/styles')
     ],
@@ -79,7 +79,7 @@ module.exports = {
       },
       {
         test: /\.scss$/,
-        loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader?minimize')
+        loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss!sass-loader?minimize')
       }
     ]
   },