From: Kevin Ball Date: Wed, 31 May 2017 04:10:49 +0000 (-0700) Subject: Remove lingering small-auto and small-shrink in favor of auto and shrink X-Git-Tag: v6.4.0-rc1~9^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf7739cf97b8670f381b4cef444fee1fbdfaa3af;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Remove lingering small-auto and small-shrink in favor of auto and shrink --- diff --git a/scss/zf-grid/_classes.scss b/scss/zf-grid/_classes.scss index 58ec3c7ff..b6f8d0994 100644 --- a/scss/zf-grid/_classes.scss +++ b/scss/zf-grid/_classes.scss @@ -73,11 +73,12 @@ } @mixin -zf-breakpoint-cell-classes($breakpoint, $vertical) { - > .#{$breakpoint}-auto { + $prefix: if($breakpoint == $-zf-zero-breakpoint, '', '#{$breakpoint}-'); + > .#{$prefix}auto { @include zf-cell-static(auto, false, $breakpoint: $breakpoint, $vertical: $vertical); } - > .#{$breakpoint}-shrink { + > .#{$prefix}shrink { @include zf-cell-static(shrink, false, $breakpoint: $breakpoint, $vertical: $vertical); } @@ -117,6 +118,8 @@ @include -zf-each-breakpoint() { @include -zf-breakpoint-cell-classes($-zf-size, $vertical); + // This is purely for responsive gutters - the margin grid has to go back and adjust widths (or heights) + // for prior breakpoints based on the responsive gutter. @if(type-of($grid-margin-gutters) == 'map' and map-has-key($grid-margin-gutters, $-zf-size)) { @each $bp in -zf-breakpoints-less-than($-zf-size) { @if(map-has-key($grid-margin-gutters, $bp)) {