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 b45b19bc67981111dc0da40f277b267a3ecfc891..a7410bf40beaa29fc70cd1f291537592dce723b4 100644 (file)
--- 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);
   }
 }