From: Kevin Ball <kmball11@gmail.com>
Date: Wed, 5 Oct 2016 21:52:55 +0000 (-0700)
Subject: Fix a couple of missed issues from recently merged PR
X-Git-Tag: v6.3-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ebbea4bda38d27e8201be829b2a69d570872003;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix a couple of missed issues from recently merged PR
---

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index b45b19bc6..a7410bf40 100644
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -19,7 +19,7 @@
   $size: $grid-row-width,
   $columns: null,
   $base: true,
-  $wrap: true
+  $wrap: true,
   $gutters: $grid-column-gutter
 ) {
   $margin: auto;
@@ -88,11 +88,11 @@
 
   // 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 {
+  @if $columns == expand {
     min-width: initial;
   }
   // max-width fixes IE 10/11 not respecting the flex-basis property
-  @if $columns != null and $columns != shrink {
+  @if $columns != expand and $columns != shrink {
     max-width: grid-column($columns);
   }
 }