From: Kevin Ball <kmball11@gmail.com>
Date: Fri, 21 Oct 2016 20:10:35 +0000 (-0700)
Subject: Merge branch 'develop' into v6.3
X-Git-Tag: v6.3-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1acb3908cb4a6b4a58d0db83510afb224a16accf;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

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

1acb3908cb4a6b4a58d0db83510afb224a16accf
diff --cc .versions
index eb5c7f6e3,eb5c7f6e3..fa7d7b5e2
--- a/.versions
+++ b/.versions
@@@ -11,4 -11,4 +11,4 @@@ modules-runtime@0.6.
  promise@0.6.7
  random@1.0.9
  underscore@1.0.8
--zurb:foundation-sites@6.2.2_2
++zurb:foundation-sites@6.2.4
diff --cc js/foundation.drilldown.js
index e1ef6c92a,bcae853fd..feebac5c7
--- a/js/foundation.drilldown.js
+++ b/js/foundation.drilldown.js
@@@ -271,6 -238,12 +271,12 @@@ class Drilldown 
          e.stopImmediatePropagation();
          // console.log('mouseup on back');
          _this._hide($elem);
+ 
+         // If there is a parent submenu, call show
+         let parentSubMenu = $elem.parent('li').parent('ul').parent('li');
 -        if (parentSubMenu.length) { 
++        if (parentSubMenu.length) {
+           _this._show(parentSubMenu);
+         }
        });
    }
  
@@@ -298,8 -271,8 +304,9 @@@
     * @param {jQuery} $elem - the current element with a submenu to open, i.e. the `li` tag.
     */
    _show($elem) {
 +    if(this.options.autoHeight) this.$wrapper.css({height:$elem.children('[data-submenu]').data('calcHeight')});
-     $elem.children('[data-submenu]').addClass('is-active');
+     $elem.attr('aria-expanded', true);
+     $elem.children('[data-submenu]').addClass('is-active').attr('aria-hidden', false);
      /**
       * Fires when the submenu has opened.
       * @event Drilldown#open
@@@ -314,8 -287,9 +321,11 @@@
     * @param {jQuery} $elem - the current sub-menu to hide, i.e. the `ul` tag.
     */
    _hide($elem) {
 +    if(this.options.autoHeight) this.$wrapper.css({height:$elem.parent().closest('ul').data('calcHeight')});
+     var _this = this;
+     $elem.parent('li').attr('aria-expanded', false);
+     $elem.attr('aria-hidden', true).addClass('is-closing')
 +    $elem.addClass('is-closing')
           .one(Foundation.transitionend($elem), function(){
             $elem.removeClass('is-active is-closing');
             $elem.blur();
diff --cc scss/components/_table.scss
index c52315e81,b3b1be8ef..2f55fa10e
--- a/scss/components/_table.scss
+++ b/scss/components/_table.scss
@@@ -108,7 -85,7 +116,7 @@@ $show-header-for-stacked: false !defaul
      font-weight: $global-weight-bold;
      padding: $table-padding;
    }
--  
++
    // Table head
    thead {
      background: $table-head-background;
diff --cc scss/grid/_classes.scss
index 300065fc1,2115881b6..2f3a999a1
--- a/scss/grid/_classes.scss
+++ b/scss/grid/_classes.scss
@@@ -133,8 -122,15 +132,13 @@@
        }
      }
  
+     .#{$expanded}.#{$row} .#{$-zf-size}-#{$collapse}.#{$row} {
+       margin-left: 0;
+       margin-right: 0;
+     }
+ 
      .#{$-zf-size}-#{$uncollapse} {
 -      $gutter: -zf-get-bp-val($grid-column-gutter, $-zf-size);
 -
 -      > .#{$column} { @include grid-col-uncollapse($gutter); }
 +      > .#{$column} { @include grid-col-gutter($-zf-size); }
      }
  
      // Positioning
diff --cc scss/settings/_settings.scss
index 574b4c3b2,1e0154ca8..cff1e2e13
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@@ -355,8 -367,9 +364,9 @@@ $input-cursor-disabled: not-allowed
  $input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out;
  $input-number-spinners: true;
  $input-radius: $global-radius;
+ $button-radius: $global-radius;
  
 -// 20. Label
 +// 19. Label
  // ---------
  
  $label-background: $primary-color;