]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
adds potential solution for #10194 feature/marginfix
authorRafiBomb <rafi@zurb.com>
Fri, 16 Jun 2017 07:00:17 +0000 (10:00 +0300)
committerRafiBomb <rafi@zurb.com>
Fri, 16 Jun 2017 07:00:17 +0000 (10:00 +0300)
scss/xy-grid/_classes.scss
test/visual/xy-grid/nested-grid.html [new file with mode: 0644]

index 0575abbecb92cb07bb28c6bdfe2fef6d9d1c6478..0e65ef78dcb73ab6a21dfe595137df62e5e5103f 100644 (file)
@@ -98,7 +98,7 @@
   $wrapping-selector: '.grid-margin-x'
 ){
   #{$wrapping-selector} {
-    @include xy-gutters($negative: true, $gutter-position: $gutter-position);
+    @include xy-gutters($negative: false, $gutter-position: $gutter-position);
 
     // Base cell styles
     > .cell {
 
       @include -xy-breakpoint-cell-classes($-zf-size, $-zf-size, $vertical);
     }
+
+    #{$wrapping-selector} {
+      margin-left: -0.9375rem;
+      margin-right: -0.9375rem;
+    }
   }
 }
 
diff --git a/test/visual/xy-grid/nested-grid.html b/test/visual/xy-grid/nested-grid.html
new file mode 100644 (file)
index 0000000..3f22332
--- /dev/null
@@ -0,0 +1,38 @@
+<!doctype html>
+<!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
+<html class="no-js" lang="en" dir="ltr">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>xy padding grid</title>
+    <link href="../assets/css/foundation.css" rel="stylesheet" />
+    <style>
+      </style>
+  </head>
+  <body>
+
+    <h4>The grid below is nested. The edges of the images should line up with each other.</h4>
+
+    <div class="grid-x grid-margin-x" id="content">
+      <div class="cell medium-auto">
+        <img class="thumbnail" src="https://placehold.it/1250x450">
+        <div class="grid-x grid-margin-x">
+          <div class="auto cell">
+          <img class="thumbnail" src="https://placehold.it/850x350">
+          </div>
+          <div class="auto cell">
+          <img class="thumbnail" src="https://placehold.it/850x350">
+          </div>
+        </div>
+        <p>Praesent id metus massa, ut blandit odio. Proin quis tortor orci. Etiam at risus et justo dignissim congue. Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus.</p>
+      </div>
+    </div>
+
+
+    <script src="../assets/js/vendor.js"></script>
+    <script src="../assets/js/foundation.js"></script>
+    <script>
+      $(document).foundation();
+    </script>
+  </body>
+</html>