From: Nicolas Coden Date: Sat, 16 Jun 2018 08:17:05 +0000 (+0200) Subject: Use pull request #11300 from ncoden/fix/xy-cell-gutter-fallback-11194 for v6.5.0 X-Git-Tag: v6.5.0-rc.1^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e4b52a85ee2ed0e5dd35409dffc468b339765fe;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Use pull request #11300 from ncoden/fix/xy-cell-gutter-fallback-11194 for v6.5.0 2e021171d fix: use fallback gutter for fallback breakpoint in XY cell #11194 Signed-off-by: Nicolas Coden --- diff --git a/scss/xy-grid/_cell.scss b/scss/xy-grid/_cell.scss index 34eb3dce2..e20e8a112 100644 --- a/scss/xy-grid/_cell.scss +++ b/scss/xy-grid/_cell.scss @@ -110,6 +110,8 @@ $breakpoint: null, $vertical: false ) { + $bp-is-fallback: false; + @if($breakpoint == null) { // If `$bp-size` is available then use this, otherwise revert to the smallest bp. @if(variable-exists(-zf-size) and type-of($-zf-size) != 'number') and $-zf-size != null { @@ -117,11 +119,16 @@ } @else { $breakpoint: $-zf-zero-breakpoint; + $bp-is-fallback: true; } } - // Get the gutter for the passed breakpoint/value. + // Get the gutter for the given breakpoint/value. $gutter: -zf-get-bp-val($gutters, $breakpoint); + // If the breakpoint is a fallback, use a fallback gutter as well + @if ($bp-is-fallback == true and $gutter == null) { + $gutter: 0; + } @if($gutter != null) { // Base flex properties