From 21be51d21fc34c63f030e2ff2b7b9fcbb02853b4 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Tue, 10 Jul 2018 20:52:57 +0200 Subject: [PATCH] fix: add missing flex reset in XY Grid responsive vertical cell widths Apply #10891 with optimizations introduced by 7e34dc3b5 to vertical cells. See https://github.com/zurb/foundation-sites/issues/10891 --- scss/xy-grid/_classes.scss | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss index fddf6b0de..eccf9986a 100644 --- a/scss/xy-grid/_classes.scss +++ b/scss/xy-grid/_classes.scss @@ -76,14 +76,14 @@ } } - %-xy-cell-base-shrink-#{$-zf-size} { + %-xy-cell-base-shrink-horizontal-#{$-zf-size} { @include xy-cell-base(shrink); } // Responsive "shrink" modifier @if not($-zf-size == small) { .grid-x > .#{$-zf-size}-shrink { - @extend %-xy-cell-base-shrink-#{$-zf-size}; + @extend %-xy-cell-base-shrink-horizontal-#{$-zf-size}; @include xy-cell-static(shrink, false); } } @@ -92,7 +92,7 @@ @for $i from 1 through $grid-columns { // Sizing (percentage) .grid-x > .#{$-zf-size}-#{$i} { - @extend %-xy-cell-base-shrink-#{$-zf-size}; + @extend %-xy-cell-base-shrink-horizontal-#{$-zf-size}; @include xy-cell-static($i, false, $gutter-type: padding); } } @@ -305,21 +305,31 @@ } @include -zf-each-breakpoint() { + // Responsive "auto" modifier @if not($-zf-size == small) { > .#{$-zf-size}-auto { @include xy-cell-base(auto); @include xy-cell-static(auto, false, $breakpoint: $-zf-size, $vertical: true); } + } + + %-xy-cell-base-shrink-vertical-#{$-zf-size} { + @include xy-cell-base(shrink); + } + // Responsive "shrink" modifier + @if not($-zf-size == small) { > .#{$-zf-size}-shrink { + @extend %-xy-cell-base-shrink-vertical-#{$-zf-size}; @include xy-cell-static(shrink, false, $breakpoint: $-zf-size, $vertical: true); } - } + // Responsive width modifiers @for $i from 1 through $grid-columns { // Sizing (percentage) > .#{$-zf-size}-#{$i} { + @extend %-xy-cell-base-shrink-vertical-#{$-zf-size}; @include xy-cell-static($i, false, $vertical: true, $gutter-type: padding); } } -- 2.47.2