From: Nicolas Coden <nicolas@ncoden.fr>
Date: Sat, 25 Aug 2018 21:53:49 +0000 (+0200)
Subject: fix: fix generated offset for zero gutters in "xy-cell-offset" #11471
X-Git-Tag: v6.6.0~3^2~108^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=281e4a8c9;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

fix: fix generated offset for zero gutters in "xy-cell-offset" #11471

Closes https://github.com/zurb/foundation-sites/issues/11471
---

diff --git a/scss/xy-grid/_position.scss b/scss/xy-grid/_position.scss
index 2f930f22b..ad8165cef 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)} - #{rem-calc($gutter-margin)}));
 
     margin-#{$direction}: #{$size};
   }