diff --git a/js/.eslintrc b/js/.eslintrc
index 645dac16dae9867c49e527b5248bc9a53d7b3e74..b21ede35a2eeaec12e48447ade95482df8a4fdac 100644
--- a/js/.eslintrc
+++ b/js/.eslintrc
@@ -153,7 +153,6 @@
         "space-return-throw-case": 2,
         "space-unary-ops": 2,
         "spaced-comment": 2,
-        "spaced-comment": 2,
 
         // es6
         "arrow-parens": 2,
diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index ad2060cbf6ee320ffbee64249972329ec4ed0f39..aa5f4924ae7c2b716498cf39e67e7a7b626a9d41 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -22,15 +22,13 @@
     @include media-breakpoint-up($breakpoint) {
       // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
       %grid-column-float-#{$breakpoint} {
-        @if $enable-flex {
-          // Do nothing
-        } @else {
-          float: left;
-        }
+        float: left;
       }
       @for $i from 1 through $columns {
         .col-#{$breakpoint}-#{$i} {
-          @extend %grid-column-float-#{$breakpoint};
+          @if not $enable-flex {
+            @extend %grid-column-float-#{$breakpoint};
+          }
           @include make-col-span($i, $columns);
         }
       }
diff --git a/scss/mixins/_image.scss b/scss/mixins/_image.scss
index bec9626f60c93c982a1d7c70b7b43b191777a76a..e5ae10a3c1742d97452edee3ee1b6e5de7fed605 100644
--- a/scss/mixins/_image.scss
+++ b/scss/mixins/_image.scss
@@ -19,7 +19,7 @@
 // Short retina mixin for setting background-image and -size.
 
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
-  background-image: url("#{file-1x}");
+  background-image: url($file-1x);
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -27,7 +27,7 @@
   only screen and (        min-device-pixel-ratio: 2),
   only screen and (                min-resolution: 192dpi),
   only screen and (                min-resolution: 2dppx) {
-    background-image: url("#{file-2x}");
+    background-image: url($file-2x);
     background-size: $width-1x $height-1x;
   }
 }