Merge branch 'develop' into v6.3

diff --cc .versions
index eb5c7f6e31641dacf59e088f6be0a923210a0915,eb5c7f6e31641dacf59e088f6be0a923210a0915..fa7d7b5e262811443029c792ecb9d8ca8ff56794
--- 1/.versions
--- 2/.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 docs/assets/scss/docs.scss
Simple merge

diff --cc docs/pages/kitchen-sink.md
Simple merge

diff --cc js/foundation.accordionMenu.js
Simple merge

diff --cc js/foundation.drilldown.js
index e1ef6c92a9dbf05fbb3f3ff13af5424c6b2a8971,bcae853fdbce64dc378c9f1f3cc77cafb0c94421..feebac5c79896ef28926babbbde5d670816485fa
--- 1/js/foundation.drilldown.js
--- 2/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 (parentSubMenu.length) { 
+ 
+         // If there is a parent submenu, call show
+         let parentSubMenu = $elem.parent('li').parent('ul').parent('li');
++        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) {
-     $elem.children('[data-submenu]').addClass('is-active');
 +    if(this.options.autoHeight) this.$wrapper.css({height:$elem.children('[data-submenu]').data('calcHeight')});
+     $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 js/foundation.tabs.js
Simple merge

diff --cc meteor-README.md
Simple merge

diff --cc package.js
Simple merge

diff --cc scss/components/_table.scss
index c52315e8154fa6715ebe62f9e67f79fcebeb321c,b3b1be8ef03a10e5ece53c87a639aab0f15a365d..2f55fa10e115627d0f099e677a56969843f45d25
--- 1/scss/components/_table.scss
--- 2/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/forms/_text.scss
Simple merge

diff --cc scss/foundation.scss
Simple merge

diff --cc scss/grid/_classes.scss
index 300065fc15648b184cfc7990364113d5caa5d277,2115881b6a3cbe008f7c60b19d7cd38115aa9e4a..2f3a999a13456446bdd68a0d4f7a0f6d16f5656e
--- 1/scss/grid/_classes.scss
--- 2/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/grid/_flex-grid.scss
Simple merge

diff --cc scss/settings/_settings.scss
index 574b4c3b2298dc4b1be9f10e824e307d6cdafa2b,1e0154ca8dc33647378a25de4fed844d54ebeb53..cff1e2e13ec89f9b3d42d09355d316eeaaf088cd
--- 1/scss/settings/_settings.scss
--- 2/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;