From 39c15b3946ee486f8a279c3e4f726b9033860c8c Mon Sep 17 00:00:00 2001 From: Kevin Ball Date: Fri, 9 Jun 2017 15:52:20 -0700 Subject: [PATCH] One final fix to auto --- scss/xy-grid/_classes.scss | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss index 7d914fd68..7ccb2d89c 100644 --- a/scss/xy-grid/_classes.scss +++ b/scss/xy-grid/_classes.scss @@ -45,6 +45,9 @@ // Auto width @include -zf-each-breakpoint() { + .grid-x > [class*="#{$-zf-size}-"] { + flex-basis: auto; + } @if not($-zf-size == small) { .grid-x > .#{$-zf-size}-auto { @include xy-cell-base(auto); @@ -58,9 +61,6 @@ } - .grid-x > [class*="#{$-zf-size}-"] { - flex-basis: auto; - } @for $i from 1 through $grid-columns { // Sizing (percentage) @@ -247,8 +247,13 @@ @include -zf-each-breakpoint() { + > [class*="#{$-zf-size}-"] { + flex-basis: auto; + } + @if not($-zf-size == small) { > .#{$-zf-size}-auto { + @include xy-cell-base(auto); @include xy-cell-static(auto, false, $breakpoint: $-zf-size, $vertical: true); } @@ -258,10 +263,6 @@ } - > [class*="#{$-zf-size}-"] { - flex-basis: auto; - } - @for $i from 1 through $grid-columns { // Sizing (percentage) > .#{$-zf-size}-#{$i} { -- 2.47.2