]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3822efe)
Apply display: block; to flex grid items with .row and .column, so the content inside...
authorGeoff Kimball <geoff@zurb.com>
Mon, 28 Mar 2016 17:34:47 +0000 (10:34 -0700)
committerGeoff Kimball <geoff@zurb.com>
Mon, 28 Mar 2016 17:34:47 +0000 (10:34 -0700)
scss/grid/_flex-grid.scss patch | blob | blame | history
test/visual/flex-grid/column-row.html [new file with mode: 0644] patch | blob

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index 1dcf34e8b1537a98fadb9414abd87a2d1edb06bb..dd5e235cb8f189374cdbf4755c9a5636fcaa4bf3 100644 (file)
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -173,6 +173,7 @@
   // The double .row class is needed to bump up the specificity
   .column.row.row {
     float: none;
+    display: block;
 
     // To properly nest a column row, padding and margin is removed
     .row & {
diff --git a/test/visual/flex-grid/column-row.html b/test/visual/flex-grid/column-row.html
new file mode 100644 (file)
index 0000000..5f40c4a
--- /dev/null
+++ b/test/visual/flex-grid/column-row.html
@@ -0,0 +1,25 @@
+<!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>Foundation for Sites Testing</title>
+    <link href="../assets/css/foundation-flex.css" rel="stylesheet" />
+  </head>
+  <body>
+    <div class="row column">
+      <h1>Flex Grid: Column Row</h1>
+
+      <p>This text is inside a combined column/row.</p>
+
+      <p>An element with the classes <code>.row</code> and <code>.column</code> should have <code>display: block</code> and not <code>display: flex</code>, so the elements inside flow normally.</p>
+    </div>
+
+    <script src="../assets/js/vendor.js"></script>
+    <script src="../assets/js/foundation.js"></script>
+    <script>
+      $(document).foundation();
+    </script>
+  </body>
+</html>
Mirror of https://github.com/foundation/foundation-sites.git