]> 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: 05e9f87)
Revert "Hotfix/menu vertical align center" feature/revert-9985-menu-vertical-align-center
authorRafi <rafibomb@users.noreply.github.com>
Mon, 22 May 2017 16:59:11 +0000 (09:59 -0700)
committerGitHub <noreply@github.com>
Mon, 22 May 2017 16:59:11 +0000 (09:59 -0700)
scss/components/_flex.scss patch | blob | blame | history
scss/components/_menu.scss patch | blob | blame | history
test/visual/menu/menu-vertical-flex.html [deleted file] patch | blob | blame | history

diff --git a/scss/components/_flex.scss b/scss/components/_flex.scss
index a878dfd09d9fcda8c25a05128ce4889a4364accf..614eef721e1be64c63f9a7726daa519e8c2ee21b 100644 (file)
--- a/scss/components/_flex.scss
+++ b/scss/components/_flex.scss
@@ -1,19 +1,10 @@
 @mixin foundation-flex-classes {
   // Horizontal alignment using justify-content
-  @each $hdir, $prop in map-remove($-zf-flex-justify, 'left') {
+  @each $hdir, $prop in map-remove($-zf-flex-justify, left) {
     .align-#{$hdir} {
       @include flex-align($x: $hdir);
     }
   }
-  
-  // Horizontal alignment Specifically for Vertical Menu
-  @each $hdir, $prop in map-remove($-zf-flex-justify, 'left', 'justify', 'spaced') {
-    .align-#{$hdir} {
-      &.vertical.menu > li > a { 
-        @include flex-align($x: $hdir);
-      }
-    }
-  }
 
   // Vertical alignment using align-items and align-self
   @each $vdir, $prop in $-zf-flex-align {
diff --git a/scss/components/_menu.scss b/scss/components/_menu.scss
index 7b939408e3e86a56321f25186d718c39d69bf031..3bdde0ddc6930c73cd9cb217016cf9def1a5662c 100644 (file)
--- a/scss/components/_menu.scss
+++ b/scss/components/_menu.scss
@@ -366,9 +366,6 @@ $menu-border: $light-gray !default;
         display: inline-block;
         vertical-align: top;
       }
-      &.vertical > li > a {
-        justify-content: center;
-      }
     }
   }
 
diff --git a/test/visual/menu/menu-vertical-flex.html b/test/visual/menu/menu-vertical-flex.html
deleted file mode 100644 (file)
index 22cef23..0000000
--- a/test/visual/menu/menu-vertical-flex.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!doctype html>
-<!--[if IE 9]><html class="lt-ie10" lang="en" > <![endif]-->
-<html class="no-js" lang="en" dir="ltr">
-
-  <head>
-    <link href="http://cdnjs.cloudflare.com/ajax/libs/foundicons/3.0.0/foundation-icons.css" rel="stylesheet">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link href="../assets/css/foundation-flex.css" rel="stylesheet" />
-
-    <style>
-      .row {
-        margin-top: 1rem;
-        margin-bottom: 2rem;
-      }
-      .example {
-        padding: 1rem;
-        border: 1px solid #ddd;
-        width: 100%;
-      }
-
-    </style>
-  </head>
-
-  <body>
-    <div class="row">
-      <div class="columns">
-        <h3>Menu Centered - Menu Vertical</h3>
-        <div class="example">
-          <div class="menu-centered">
-            <ul class="menu vertical">
-              <li><a href="#" target="_blank">Link</a></li>
-              <li><a href="#" target="_blank">Link</a></li>
-              <li><a href="#" target="_blank">Link</a></li>
-              <li><a href="#" target="_blank">Link</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns">
-        <h3>Menu Vertical - Align Center</h3>
-        <div class="example">
-          <ul class="menu vertical align-center">
-            <li><a href="#" target="_blank">Link</a></li>
-            <li><a href="#" target="_blank">Link</a></li>
-            <li><a href="#" target="_blank">Link</a></li>
-            <li><a href="#" target="_blank">Link</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns">
-        <h3>Menu Vertical - Align Right</h3>
-        <div class="example">
-          <ul class="menu vertical align-right">
-            <li><a href="#" target="_blank">Link</a></li>
-            <li><a href="#" target="_blank">Link</a></li>
-            <li><a href="#" target="_blank">Link</a></li>
-            <li><a href="#" target="_blank">Link</a></li>
-          </ul>
-        </div>
-      </div>
-    </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