From: Geoff Kimball Date: Wed, 24 Feb 2016 00:51:05 +0000 (-0800) Subject: Add back support for numeric gutter values in flex-grid-column() mixin, fixes #8214 X-Git-Tag: v6.2.0~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=979e2a94e893638d5b8199dc29b5c5527403ff59;p=thirdparty%2Ffoundation%2Ffoundation-sites.git 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 71fe71feb..7c6335843 100644 --- 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 {