From: Brett Mason <brettsmason@gmail.com>
Date: Thu, 17 Dec 2015 08:10:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'foundation/develop' into patch-2
X-Git-Tag: v6.1.0~40^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7515%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge remote-tracking branch 'foundation/develop' into patch-2

# Conflicts:
#	scss/components/_dropdown-menu.scss
---

9ac98665cd4618c4de6cdf1061ec0f41b7064862
diff --cc scss/components/_dropdown-menu.scss
index 50efb1e1a,3be55eb8c..ed29f0512
--- a/scss/components/_dropdown-menu.scss
+++ b/scss/components/_dropdown-menu.scss
@@@ -46,13 -42,13 +46,13 @@@ $dropdownmenu-border: 1px solid $medium
            position: relative;
          }
          &.is-down-arrow > a::after {
 -          @include css-triangle(5px, $anchor-color, down);
 +          @include css-triangle(5px, $dropdownmenu-arrow-color, down);
            position: absolute;
-           top: 12px;
-           right: 5px;
+           top: rem-calc(2px) + rem-calc(get-side($menu-item-padding, top));
+           #{$global-right}: 5px;
          }
          &.is-left-arrow > a::after {
 -          @include css-triangle(5px, $anchor-color, $global-left);
 +          @include css-triangle(5px, $dropdownmenu-arrow-color, left);
            float: left;
            margin-left: 0;
            margin-right: 10px;
@@@ -62,11 -58,11 +62,11 @@@
          }
        }
  
--      &.is-left-arrow.opens-inner .submenu{
++      &.is-left-arrow.opens-inner .submenu {
          right: 0;
          left: auto;
        }
--      &.is-right-arrow.opens-inner .submenu{
++      &.is-right-arrow.opens-inner .submenu {
          left: 0;
          right: auto;
        }