_flex-grid.scss in foundation-rails-6.2.4.0

- old
+ new

@@ -153,22 +153,32 @@
   // Row
   .row {
     @include flex-grid-row;
 
     // Nesting behavior
-    & & {
+    & .row {
       @include flex-grid-row(nest, $base: false);
     }
 
     // Expanded row
     &.expanded {
       max-width: none;
     }
 
     &.collapse {
-      > .column { @include grid-col-collapse; }
+      > .column {
+        @include grid-col-collapse;
+      }
     }
+
+    // Undo negative margins
+    // From collapsed child
+    &.is-collapse-child,
+    &.collapse > .column > .row {
+      margin-left: 0;
+      margin-right: 0;
+    }
   }
 
   // Column
   .column {
     @include flex-grid-column;
@@ -177,17 +187,17 @@
   // Column row
   // The double .row class is needed to bump up the specificity
   .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 {
     @for $i from 1 through $grid-column-count {
       // Sizing (percentage)