From: Brett Mason <brettsmason@gmail.com>
Date: Fri, 16 Jun 2017 20:24:32 +0000 (+0100)
Subject: Attempt at fixing the issue of using grid-margin-x on grid-y breaking the width,... 
X-Git-Tag: v6.4.0-rc4~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10200%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Attempt at fixing the issue of using grid-margin-x on grid-y breaking the width, and grid-margin-y on grid-x breaking the height.
Seems to work correctly so far from testing.
---

diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss
index f039f992a..0d038110b 100644
--- a/scss/xy-grid/_classes.scss
+++ b/scss/xy-grid/_classes.scss
@@ -66,6 +66,16 @@
       }
     }
   }
+
+  // Reset width when using `.grid-margin-x` not on `.grid-x`
+  .grid-margin-x:not(.grid-x) > .cell {
+    width: auto;
+  }
+
+  // Reset height when using `.grid-margin-y` not on `.grid-y`
+  .grid-margin-y:not(.grid-y) > .cell {
+    height: auto;
+  }
 }
 
 @mixin -xy-breakpoint-cell-classes($class-breakpoint, $gutter-breakpoint, $vertical) {