Swap url path concatination for interpolation, sass-lint hates da plus

sasstools/sass-lint#63
ManageIQ · May 24, 2017 · 5edde0b · 5edde0b
1 parent a28262c
commit 5edde0b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/client/app/layouts/_application.sass b/client/app/layouts/_application.sass
@@ -1,5 +1,4 @@
 // Product overrides of Boostrap & Patternfly variables
-
 $modal-about-pf-bg-color: #083c5a
 // sets background color of 'About' modal
 
@@ -8,7 +7,7 @@ $modal-about-pf-bg-color: #083c5a
 
 .about-modal-pf
   background-color: $modal-about-pf-bg-color
-  background-image: url($imgBasePath + 'images/bg-modal-about-pf.png')
+  background-image: url('#{$img-base-path}images/bg-modal-about-pf.png')
 
 // @font-face
 //  font-family: 'FontAwesome'

diff --git a/client/app/layouts/_navigation.sass b/client/app/layouts/_navigation.sass
@@ -1,6 +1,6 @@
 .navbar-pf-vertical
   background-color: $app-color-dark-blue-gray
-  background-image: url($imgBasePath + 'images/bg-navbar.png')
+  background-image: url('#{$img-base-path}images/bg-navbar.png')
   background-repeat: no-repeat
   background-size: auto 100%
 

diff --git a/client/app/states/login/_login.sass b/client/app/states/login/_login.sass
@@ -1,21 +1,21 @@
 @import '_bem-support/index'
 
 +block(login-pf)
-  background-color: $app-color-deep-blue
-  height: calc(100vh)
-  margin-bottom: -38px
-  margin-top: -60px
-
   +element(img)
     +modifier(top)
       left: 0
       top: 0
     +modifier(bottom)
+      bottom: 0
       position: fixed
       right: 0
-      bottom: 0
 
 
+  background-color: $app-color-deep-blue
+  height: calc(100vh)
+  margin-bottom: -38px
+  margin-top: -60px
+
   .container
     background-color: transparent
 

diff --git a/client/assets/sass/styles.sass b/client/assets/sass/styles.sass
@@ -1,5 +1,5 @@
 // Global constants
-$imgBasePath: '/' !default
+$img-base-path: '/'
 
 @import 'patternfly'
 

diff --git a/config/webpack.dev.js b/config/webpack.dev.js
@@ -118,7 +118,7 @@ module.exports = {
         use: ExtractTextWebpackPlugin.extract({
           fallback: 'style-loader',
           allChunks: true,
-          loader: [
+          use: [
             'css-loader?importLoaders=1&sourceMap=true',
             'postcss-loader',
           ],
@@ -129,12 +129,12 @@ module.exports = {
         use: ExtractTextWebpackPlugin.extract({
           fallback: 'style-loader',
           allChunks: true,
-          loader: [
+          use: [
             'css-loader?importLoaders=1&sourceMap=true',
             {
               loader: 'sass-loader',
               options: {
-                data: `$imgBasePath: ${appBasePath}`,
+                data: `$img-base-path: ${appBasePath}`,
                 sourceMap: true,
                 includePaths: [
                   `${root}/assets/sass`,