]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge remote-tracking branch 'foundation/develop' into patch-2 7515/head
authorBrett Mason <brettsmason@gmail.com>
Thu, 17 Dec 2015 08:10:10 +0000 (08:10 +0000)
committerBrett Mason <brettsmason@gmail.com>
Thu, 17 Dec 2015 08:10:10 +0000 (08:10 +0000)
# Conflicts:
# scss/components/_dropdown-menu.scss

1  2 
scss/components/_dropdown-menu.scss

index 50efb1e1aa334ac4ec7b0875165d515275bda55d,3be55eb8c507a6d9f37a7f45df2cc875e7bc2974..ed29f05126dfabd97005b18c0877afc1851ec34b
@@@ -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;
          }
        }
  
--      &.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;
        }