From 6163a03fd48a25edcbb700a7014837c021f0f947 Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Sun, 8 Apr 2018 23:17:43 +0200 Subject: [PATCH] fix: use the right breakpoints in block-grid for gutter calculation --- scss/xy-grid/_classes.scss | 6 +++--- scss/xy-grid/_layout.scss | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss index 3cc45a5b0..c967c70bb 100644 --- a/scss/xy-grid/_classes.scss +++ b/scss/xy-grid/_classes.scss @@ -188,7 +188,7 @@ @include -zf-each-breakpoint { @for $i from 1 through $xy-block-grid-max { .#{$-zf-size}-up-#{$i} { - @include xy-grid-layout($i, '.cell', false, $gutter-type: padding); + @include xy-grid-layout($n: $i, $selector: '.cell', $gutter-output: false, $gutter-type: padding, $breakpoint: $-zf-size); } } } @@ -203,7 +203,7 @@ @each $bp in -zf-breakpoints-less-than($-zf-size) { @if(map-has-key($grid-margin-gutters, $bp)) { .grid-margin-x.#{$bp}-up-#{$i} { - @include xy-grid-layout($i, '.cell', false, $gutter-type: margin, $breakpoint: $bp); + @include xy-grid-layout($n: $i, $selector: '.cell', $gutter-output: false, $gutter-type: margin, $breakpoint: $-zf-size); } } } @@ -211,7 +211,7 @@ } @for $i from 1 through $xy-block-grid-max { .grid-margin-x.#{$-zf-size}-up-#{$i} { - @include xy-grid-layout($i, '.cell', false, $gutter-type: margin, $breakpoint: $-zf-size); + @include xy-grid-layout($n: $i, $selector: '.cell', $gutter-output: false, $gutter-type: margin, $breakpoint: $-zf-size); } } } diff --git a/scss/xy-grid/_layout.scss b/scss/xy-grid/_layout.scss index 3b7650e32..309abe944 100644 --- a/scss/xy-grid/_layout.scss +++ b/scss/xy-grid/_layout.scss @@ -28,6 +28,6 @@ $size: percentage(1/$n); & > #{$selector} { - @include xy-cell($size, $gutter-output, $gutters, $gutter-type, $gutter-position, $breakpoint, $vertical); + @include xy-cell($size, $gutter-output: $gutter-output, $gutters: $gutters, $gutter-type: $gutter-type, $gutter-position: $gutter-position, $breakpoint: $breakpoint, $vertical: $vertical); } } -- 2.47.2