Merge pull request #9177 from zurb/top-bar-flex-grid

Top bar flex grid
foundation · Sep 13, 2016 · 786375f · 786375f
2 parents d803661 + ef38c5c
commit 786375f
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/scss/components/_top-bar.scss b/scss/components/_top-bar.scss
@@ -101,9 +101,11 @@ $topbar-unstack-breakpoint: medium !default;
     flex-wrap: nowrap;
 
     // scss-lint:disable ZeroUnit
-    .top-bar-left,
+    .top-bar-left {
+      flex: 1 1 auto;
+    }
     .top-bar-right {
-      flex: 1 1 0px;
+      flex: 0 1 auto;
     }
   }
   @else {

diff --git a/test/visual/flex-grid/top-bar.html b/test/visual/flex-grid/top-bar.html
@@ -0,0 +1,49 @@
+
+<!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="top-bar">
+      <div class="top-bar-title">
+        This should be left aligned as a title
+      </div>
+      <div class="top-bar-left">
+        This should be left aligned next to title
+      </div>
+      <div class="top-bar-right">
+        This should be right aligned
+      </div>
+    </div>
+    <hr/>
+    <div class="top-bar">
+      <div class="top-bar-title">
+        This should be left aligned as a title
+      </div>
+      <div class="top-bar-right">
+        This should be right aligned
+      </div>
+    </div>
+
+    <hr/>
+    <div class="top-bar">
+      <div class="top-bar-left">
+        This should be left aligned
+      </div>
+      <div class="top-bar-right">
+        This should be right aligned
+      </div>
+    </div>
+
+    <script src="../assets/js/vendor.js"></script>
+    <script src="../assets/js/foundation.js"></script>
+    <script>
+      $(document).foundation();
+    </script>
+  </body>
+</html>