From: Saad Shahd <dev.saad.shahd@gmail.com>
Date: Thu, 26 May 2016 12:36:53 +0000 (+0200)
Subject: Fix: flex-grid nested rows with collapse
X-Git-Tag: v6.2.4-rc1~70^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8853%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix: flex-grid nested rows with collapse

Undo the margin declaration for `.row .row.collapse`

Adds:
```CSS
.row .row.collapse {
  margin-left:
}
```
---

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index 18910b26a..d8f33a640 100644
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -165,7 +165,13 @@
     }
 
     &.collapse {
-      > .column { @include grid-col-collapse; }
+      > .column {
+        @include grid-col-collapse;
+        > .row {
+          margin-left: 0;
+          margin-right: 0;
+        }
+      }
     }
   }