_flex-grid.scss in foundation-rails-6.2.1.0

- old
+ new

@@ -94,10 +94,15 @@
     $padding: rem-calc($gutter) / 2;
     padding-left: $padding;
     padding-right: $padding;
   }
 
+  // fixes recent Chrome version not limiting child width
+  // https://stackoverflow.com/questions/34934586/white-space-nowrap-and-flexbox-did-not-work-in-chrome
+  @if $columns == null {
+    min-width: 0;
+  }
   // max-width fixes IE 10/11 not respecting the flex-basis property
   @if $columns != null and $columns != shrink {
     max-width: grid-column($columns);
   }
 }
@@ -171,10 +176,11 @@
 
   // 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;
@@ -202,34 +208,30 @@
     // Source ordering
     @for $i from 1 through 6 {
       .#{$-zf-size}-order-#{$i} {
         @include flex-order($i);
       }
-
-      .#{$-zf-size}-up-#{$i} {
-        @include flex-grid-layout($i);
-      }
     }
 
     // Block grid
     @for $i from 1 through $block-grid-max {
       .#{$-zf-size}-up-#{$i} {
-        @include grid-layout($i);
+        @include flex-grid-layout($i);
       }
     }
 
-    @if $-zf-size != small {
+    @if $-zf-size != $-zf-zero-breakpoint {
       // Sizing (expand)
       @include breakpoint($-zf-size) {
         .#{$-zf-size}-expand {
           flex: flex-grid-column();
         }
       }
 
       // Auto-stacking/unstacking
       @at-root (without: media) {
         .row.#{$-zf-size}-unstack {
-          .column {
+          > .column {
             flex: flex-grid-column(100%);
 
             @include breakpoint($-zf-size) {
               flex: flex-grid-column();
             }