From: Kevin Ball <kmball11@gmail.com>
Date: Wed, 7 Dec 2016 17:33:08 +0000 (-0800)
Subject: Merge branch 'v6.3' into develop
X-Git-Tag: v6.3.0-rc2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db75e3399c4811373c9bc514980909c201798d55;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'v6.3' into develop
---

db75e3399c4811373c9bc514980909c201798d55
diff --cc scss/_global.scss
index 65e459104,e23f65b8d..91c598644
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@@ -103,16 -103,12 +103,12 @@@ $global-left: if($global-text-directio
  $global-right: if($global-text-direction == rtl, left, right);
  
  // Internal variables used for colors
 -$primary-color: map-get($foundation-palette, primary);
 -$secondary-color: map-get($foundation-palette, secondary);
 -$success-color: map-get($foundation-palette, success);
 -$warning-color: map-get($foundation-palette, warning);
 -$alert-color: map-get($foundation-palette, alert);
 +$primary-color: get-color(primary);
 +$secondary-color: get-color(secondary);
 +$success-color: get-color(success);
 +$warning-color: get-color(warning);
 +$alert-color: get-color(alert);
  
- // Remove this in 6.3
- $-zf-menu-icon-imported: false;
- $-zf-flex-classes-imported: false;
- 
  @mixin foundation-global-styles {
    @include -zf-normalize;
  
diff --cc scss/settings/_settings.scss
index cecfd6ba8,30fae6590..149f3ad3a
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@@ -396,10 -410,12 +410,12 @@@ $menu-margin: 0
  $menu-margin-nested: 1rem;
  $menu-item-padding: 0.7rem 1rem;
  $menu-item-color-active: $white;
 -$menu-item-background-active: map-get($foundation-palette, primary);
 +$menu-item-background-active: get-color(primary);
  $menu-icon-spacing: 0.25rem;
+ $menu-item-background-hover: $light-gray;
+ $menu-border: $light-gray;
  
- // 22. Meter
+ // 23. Meter
  // ---------
  
  $meter-height: 1rem;