From c964af098af63514b21998fd3db22e2e321a85bd Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Mon, 10 Sep 2018 22:50:32 +0200 Subject: [PATCH] Use pull request #11472 from ncoden/fix/xy-grid-offset-zero-margin-11471 for v6.5.0 281e4a8c9 fix: fix generated offset for zero gutters in "xy-cell-offset" #11471 c07d3d99a fix: fix offset calculation in "xy-cell-offset" Signed-off-by: Nicolas Coden --- scss/xy-grid/_position.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/xy-grid/_position.scss b/scss/xy-grid/_position.scss index 2f930f22b..336275de5 100644 --- a/scss/xy-grid/_position.scss +++ b/scss/xy-grid/_position.scss @@ -24,7 +24,8 @@ @include -zf-breakpoint-value($breakpoint, $gutters) { $gutter: rem-calc($-zf-bp-value) / 2; - $size: if($gutter-type == 'margin', calc(#{xy-cell-size($n)} + #{$gutter}), #{xy-cell-size($n)}); + $gutter-margin: if($gutter-type == 'margin', $gutter, 0); + $size: if($gutter-margin == 0, #{xy-cell-size($n)}, calc(#{xy-cell-size($n)} + #{$gutter-margin})); margin-#{$direction}: #{$size}; } -- 2.47.2