Add back support for numeric gutter values in flex-grid-column() mixin, fixes #8214

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index 71fe71febd89cd694b42d535c37dd0e51838a053..7c633584307adb41b8dcedae8b952eb3b70ab3cf 100644 (file)
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -79,15 +79,22 @@
   // Base properties
   flex: flex-grid-column($columns);
 
-  // Padding
-  @each $breakpoint, $value in $gutter {
-    $padding: rem-calc($value) / 2;
-
-    @include breakpoint($breakpoint) {
-      padding-left: $padding;
-      padding-right: $padding;
+  // Gutters
+  @if type-of($gutter) == 'map' {
+    @each $breakpoint, $value in $gutter {
+      $padding: rem-calc($value) / 2;
+
+      @include breakpoint($breakpoint) {
+        padding-left: $padding;
+        padding-right: $padding;
+      }
     }
   }
+  @else if type-of($gutter) == 'number' and strip-unit($gutter) > 0 {
+    $padding: rem-calc($gutter) / 2;
+    padding-left: $padding;
+    padding-right: $padding;
+  }
 
   // max-width fixes IE 10/11 not respecting the flex-basis property
   @if $columns != null and $columns != shrink {