From: Kevin Ball <kmball11@gmail.com>
Date: Sat, 27 May 2017 04:04:35 +0000 (-0700)
Subject: Fix collapse classes
X-Git-Tag: v6.4.0-rc1~9^2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f27c2920525926677dce0ab6200cb85c39a2651d;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix collapse classes
---

diff --git a/scss/zf-grid/_classes.scss b/scss/zf-grid/_classes.scss
index 5e62dfe5a..ed94c05a1 100644
--- 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 44d046d73..e5a3990c0 100644
--- 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);
         }
       }