From: Brett Mason <brettsmason@gmail.com>
Date: Thu, 6 Oct 2016 10:37:58 +0000 (+0100)
Subject: Fix incorrect flex grid output.
X-Git-Tag: v6.2.4-rc1~18^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c460d70fc56e3c94161ead3581ea35eecf7171ee;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix incorrect flex grid output.
The output should of been `.row .column.row.row, .row .row.row.columns`
---

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index df9a49703..702e7721f 100644
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -186,17 +186,17 @@
 
   // Column row
   // The double .row class is needed to bump up the specificity
-  & .column.row.row {
+  .column.row.row {
     float: none;
     display: block;
+  }
 
-    // To properly nest a column row, padding and margin is removed
-    & .row {
-      padding-left: 0;
-      padding-right: 0;
-      margin-left: 0;
-      margin-right: 0;
-    }
+  // To properly nest a column row, padding and margin is removed
+  .row .column.row.row {
+    padding-left: 0;
+    padding-right: 0;
+    margin-left: 0;
+    margin-right: 0;
   }
 
   @include -zf-each-breakpoint {
@@ -239,7 +239,7 @@
 
       // Auto-stacking/unstacking
       @at-root (without: media) {
-        & .row.#{$-zf-size}-unstack {
+        .row.#{$-zf-size}-unstack {
           > .column {
             flex: flex-grid-column(100%);
 
@@ -281,4 +281,4 @@
     // scss-lint:disable PlaceholderInExtend
     @extend .column;
   }
-}
+}
\ No newline at end of file