Locked sass deps; fixed .matched-text fade function

weaveworks · Jan 20, 2017 · a9d6b1a · a9d6b1a
1 parent fdf90a0
commit a9d6b1a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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;
   }
 
@@ -1499,7 +1499,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
@@ -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
@@ -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
@@ -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')
       }
     ]
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -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'
           }
         ]
       },
@@ Expand Down @@