From: Kevin Ball <kmball11@gmail.com>
Date: Thu, 25 May 2017 22:25:37 +0000 (-0700)
Subject: Merge branch 'develop' into better-menu-rework
X-Git-Tag: v6.4.0-rc1~20^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5497a49a6e2e4d4eb8aaf8f65c3f96b1bd08aeef;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into better-menu-rework
---

5497a49a6e2e4d4eb8aaf8f65c3f96b1bd08aeef
diff --cc scss/components/_menu.scss
index e0c9ea6c2,8629cf20d..44089574c
--- a/scss/components/_menu.scss
+++ b/scss/components/_menu.scss
@@@ -296,9 -244,7 +296,7 @@@ $menu-item-background-hover: $light-gra
  }
  
  @mixin menu-text {
 -  padding: $menu-item-padding;
 +  padding: $global-menu-padding;
-   padding-top: 0;
-   padding-bottom: 0;
  
    font-weight: bold;
    line-height: 1;