Fix collapse classes

diff --git a/scss/zf-grid/_classes.scss b/scss/zf-grid/_classes.scss
index 5e62dfe5a121855bb87d54c447450df3479aaeb0..ed94c05a18a198234a1e7371f32e3a50d0bf8345 100644 (file)
--- a/scss/zf-grid/_classes.scss
+++ b/scss/zf-grid/_classes.scss
@@ -139,11 +139,11 @@
 @mixin zf-collapse-grid-classes {
   @include -zf-each-breakpoint {
     .#{$-zf-size}-margin-collapse {
-        @include zf-grid-collapse($gutter-type: margin);
+      @include zf-grid-collapse($gutter-type: margin);
     }
 
     .#{$-zf-size}-padding-collapse {
-        @include zf-grid-collapse($gutter-type: padding);
+      @include zf-grid-collapse($gutter-type: padding);
     }
   }
 }

diff --git a/scss/zf-grid/_collapse.scss b/scss/zf-grid/_collapse.scss
index 44d046d73fe4c233c45497a856e0acfc1a0b2c9a..e5a3990c0c29d4d5c9ebbd5c3a151a3d5f4ecfe5 100644 (file)
--- a/scss/zf-grid/_collapse.scss
+++ b/scss/zf-grid/_collapse.scss
@@ -28,11 +28,11 @@
       }
     }
 
-    @include -zf-each-breakpoint {
-      // Output new widths to not include gutters
+    // Output new widths to not include gutters
+    @each $bp in $breakpoint-classes {
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
-        > .#{$-zf-size}-#{$i} {
+        > .#{$bp}-#{$i} {
           @include zf-cell-nonresponsive($i, $gutter-output: false, $gutter-type: padding);
         }
       }
@@ -43,16 +43,16 @@
     @each $value in $gutter-position {
       margin-#{$value}: 0;
 
-      > .#{$selector} {
+      > #{$selector} {
         padding-#{$value}: 0;
       }
     }
 
-    @include -zf-each-breakpoint {
-      // Output new widths to not include gutters
+    // Output new widths to not include gutters
+    @each $bp in $breakpoint-classes {
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
-        > .#{$-zf-size}-#{$i} {
+        > .#{$bp}-#{$i} {
           @include zf-cell-nonresponsive($i, $gutter-output: false, $gutter-type: padding);
         }
       }