From: Kevin Ball <kmball11@gmail.com>
Date: Fri, 9 Jun 2017 20:04:40 +0000 (-0700)
Subject: Iterate on basis reset
X-Git-Tag: v6.4.0-rc3~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6e27f96d9e6692644612819efe88424579660f2;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Iterate on basis reset
---

diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss
index 032100521..7d914fd68 100644
--- a/scss/xy-grid/_classes.scss
+++ b/scss/xy-grid/_classes.scss
@@ -41,11 +41,6 @@
       @include xy-cell-static(shrink, false);
     }
 
-    @include -zf-each-breakpoint() {
-      > [class*="#{$-zf-size}-"] {
-        flex-basis: auto;
-      }
-    }
   }
 
   // Auto width
@@ -63,6 +58,10 @@
 
     }
 
+    .grid-x > [class*="#{$-zf-size}-"] {
+      flex-basis: auto;
+    }
+
     @for $i from 1 through $grid-columns {
       // Sizing (percentage)
       .#{$-zf-size}-#{$i} {
@@ -259,6 +258,10 @@
 
       }
 
+      > [class*="#{$-zf-size}-"] {
+        flex-basis: auto;
+      }
+
       @for $i from 1 through $grid-columns {
         // Sizing (percentage)
         > .#{$-zf-size}-#{$i} {
@@ -266,11 +269,6 @@
         }
       }
 
-      @include -zf-each-breakpoint() {
-        > [class*="#{$-zf-size}-"] {
-          flex-basis: auto;
-        }
-      }
     }
   }
 
diff --git a/test/visual/xy-grid/margin-grid.html b/test/visual/xy-grid/margin-grid.html
index 387b0c358..333513ab4 100644
--- a/test/visual/xy-grid/margin-grid.html
+++ b/test/visual/xy-grid/margin-grid.html
@@ -61,8 +61,8 @@
     <h2>Auto and Shrink</h2>
 
     <div class="grid-x grid-margin-x">
-      <div class="cell medium-shrink"><div class="demo">Shrink on medium</div></div>
-      <div class="cell medium-auto"><div class="demo">Auto on medium</div></div>
+      <div class="cell medium-shrink large-10"><div class="demo">Shrink on medium, 10 on large</div></div>
+      <div class="cell medium-auto large-2"><div class="demo">Auto on medium, 2 large</div></div>
     </div>
 
     <h2>Collapse</h2>