From 01e64762a6d484ebcd1f64c879c52c4f2c0516b9 Mon Sep 17 00:00:00 2001
From: Geoff Kimball <geoff@zurb.com>
Date: Mon, 4 Jan 2016 14:24:13 -0800
Subject: [PATCH] Add column row styles to flex grid, closes #7718

---
 scss/grid/_flex-grid.scss | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index 2ca920f9b..c8f060286 100644
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -170,8 +170,7 @@ $-zf-flex-align: (
     @include flex-grid-row;
 
     // Nesting behavior
-    & &,
-    .column-row & {
+    & & {
       @include flex-grid-row(nest, $base: false);
     }
 
@@ -190,6 +189,20 @@ $-zf-flex-align: (
     @include flex-grid-column;
   }
 
+  // Column row
+  // The double .row class is needed to bump up the specificity
+  .column.row.row {
+    float: none;
+
+    // To properly nest a column row, padding and margin is removed
+    .row & {
+      padding-left: 0;
+      padding-right: 0;
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+
   @include -zf-each-breakpoint {
     @for $i from 1 through $grid-column-count {
       // Sizing (percentage)
-- 
2.47.2