Merge branch 'develop' into feature/update-zurb-urls

# Conflicts:
#	docs/partials/footer.html
#	package.nuspec

Author: joeworkman

.commitlintrc.yml

@@ -1,2 +1,5 @@
 extends:
   - '@commitlint/config-conventional'
+rules:
+  subject-case: [0, always]
+  subject-full-stop: [0, always]

.huskyrc.yml

@@ -1,6 +1,5 @@
 hooks:
   commit-msg: >
-    node ./script/husky-commit-lint.js --color -e $GIT_PARAMS &&
-    node ./script/husky-commit-test.js  --color
+    node ./script/husky-commit-lint.js --color -e $GIT_PARAMS
   pre-push:
     node ./script/husky-push-test.js  --color

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2011-2019 ZURB, Inc.
+Copyright © 2011-2020 ZURB, Inc.
 
 MIT License
 

bower.json

@@ -50,7 +50,6 @@
     "code-of-conduct.md",
     "composer.json",
     "CONTRIBUTING.md",
-    "docslink.sh",
     "gulpfile.js",
     "meteor-README.md",
     "package.js",

browserstack.json

@@ -1,4 +1,6 @@
 {
+    "username": "joeworkman",
+    "key": "vutaD3ypYamTHAHQxP5Z",
     "test_path": "test/javascript/index.html",
     "test_framework": "mocha",
     "exit_with_fail": true,
@@ -40,4 +42,4 @@
             "real_mobile": "true"
         }
     ]
-}
+}

docs/layout/default.html

@@ -44,7 +44,6 @@ <h5 class=""><strong>To master everything new in 6.4, along with the rest of Fou
         </div>
       </div>
 
-      {{> footer-contact}}
       {{> footer}}
     </div>
   </div>

docs/pages/flexbox-mode.md

@@ -25,7 +25,7 @@ Flexbox mode is only supported in these browsers:
 
 ## Enabling Flexbox Mode
 
-If you're using the CSS version of Foundation, you can generate a <a href="https://get.foundation/sites/download">custom download of Foundation</a> with flexbox mode enabled. If you're using the Sass version of Foundation, you can enable flexbox mode two ways:
+You can enable flexbox mode two ways:
 
 If you use the `foundation-everything()` mixin in your main Sass file, pass in the parameter `true` to enable flexbox mode.
 

docs/pages/installation.md

@@ -205,7 +205,7 @@ After you selected "Foundation for Sites", Foundation CLI will ask you which tem
     <li>Install the <a href="https://github.com/felixrieseberg/windows-build-tools">windows-build-tools</a> (recommended) and make python afterwards accessible via <code>npm config set python "%USERPROFILE%\.windows-build-tools\python27\python.exe"</code></li>
     <li>Install <a href="https://www.python.org/downloads/">python</a> (not recommended) and add it to your system environment variables</li>
   </ol>
- 
+
   <p>The first way is recommended if you've not installed python v2.7 yet as it doesn't affect your machine outside the node environment. In case you've already installed python v2.7 you may of course skip both ways and start using foundationc-cli immediately.</p>
 </div>
 
@@ -226,7 +226,7 @@ After you selected "Foundation for Sites", Foundation CLI will ask you which tem
       If you aren't into Sass, we have a starter template with compiled CSS and JavaScript, as well as a starting `index.html` file for you to hack on. Just unzip and get coding!
     </p>
     <p class="text-center">
-      <a href="https://get.foundation/sites/download" class="button">Download Foundation</a>
+      <a href="https://dhbhdrzi4tiry.cloudfront.net/downloads/releases/Foundation-6.6.1-CSS-project.zip" class="button">Download Foundation</a>
     </p>
   </div>
 </div>
@@ -239,23 +239,23 @@ The folks at [jsDelivr](https://www.jsdelivr.com) host the compressed Foundation
 
 ```html
 <!-- Compressed CSS -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.4.3/dist/css/foundation.min.css" integrity="sha256-GSio8qamaXapM8Fq9JYdGNTvk/dgs+cMLgPeevOYEx0= sha384-wAweiGTn38CY2DSwAaEffed6iMeflc0FMiuptanbN4J+ib+342gKGpvYRWubPd/+ sha512-QHEb6jOC8SaGTmYmGU19u2FhIfeG+t/hSacIWPpDzOp5yygnthL3JwnilM7LM1dOAbJv62R+/FICfsrKUqv4Gg==" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.6.1/dist/css/foundation.min.css" integrity="sha256-Q2fXBbKhtsyhYrSLa7hXCNV+FdhbQhyrjks8Kic0u/U=" crossorigin="anonymous">
 
 <!-- Compressed JavaScript -->
-<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.4.3/dist/js/foundation.min.js" integrity="sha256-mRYlCu5EG+ouD07WxLF8v4ZAZYCA6WrmdIXyn1Bv9Vk= sha384-KzKofw4qqetd3kvuQ5AdapWPqV1ZI+CnfyfEwZQgPk8poOLWaabfgJOfmW7uI+AV sha512-0gHfaMkY+Do568TgjJC2iMAV0dQlY4NqbeZ4pr9lVUTXQzKu8qceyd6wg/3Uql9qA2+3X5NHv3IMb05wb387rA==" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.6.1/dist/js/foundation.min.js" integrity="sha256-tdB5sxJ03S1jbwztV7NCvgqvMlVEvtcoJlgf62X49iM=" crossorigin="anonymous"></script>
 ```
 
 From Foundation 6.4, flex is enabled by default and **only the new XY Grid is available**. However, others CSS versions are available for backward compatibility and the most common usage cases. For others uses and advanced customization, we recommand to build Foundation with custom settings (see others installation methods).
 
 ```html
 <!-- foundation-float.min.css: Compressed CSS with legacy Float Grid -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.4.3/dist/css/foundation-float.min.css" integrity="sha256-TPcVVrzfTETpAWQ8HhBHIMT7+DbszMr5n3eFi+UwIl8= sha384-+aXh7XSzITwlvjelsNWuL1A9rT8pWGaiqMMeUjtKcsWIfzT1oV8Mp3oYxmjPK8Gv sha512-cArttU/Yh+PzfQ/dhCdfBiU9+su+fuCwFxLrlLbvuJE/ynUbstaKweVPs7Hdbok9jlv9cwt+xdk20wRz7oYErQ==" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.6.1/dist/css/foundation-float.min.css" integrity="sha256-4ldVyEvC86/kae2IBWw+eJrTiwNEbUUTmN0zkP4luL4=" crossorigin="anonymous">
 
 <!-- foundation-prototype.min.css: Compressed CSS with prototyping classes -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.4.3/dist/css/foundation-prototype.min.css" integrity="sha256-JyhZsgvsqjrdl9GPOILi/zyc+z4dcwXiyP1Q7cwWlM0= sha384-GtUT6gOaCY/S1ggTUOnqe5CQAEAZ6oVTmMq3X4vfZrvp+tLgjBEmwVxJnukor+o0 sha512-x3+KBxBjFh8PGncrfDOsJhntYDBFdJxmpb211THYkQOaGWvk7ckZG6prGUpZqz85AXgiispjow06+bDnIxnWDQ==" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.6.1/dist/css/foundation-prototype.min.css" integrity="sha256-WkUTcNCS9N9OXBuGE0w6uYBiFviiIsM5JJK6JCol8jQ=" crossorigin="anonymous">
 
 <!-- foundation-rtl.min.css: Compressed CSS with right-to-left reading direction -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.4.3/dist/css/foundation-rtl.min.css" integrity="sha256-Az+E7JXW71Srarkum5QPTdnobddg2GqI1i8+nMusgLk= sha384-eBKuNtkGVmsJD0uNnWoKYYVnzDT0PXV+XNyAgmmZwYVn7MSNcaR4i5HjOpSRd0o6 sha512-d0RjiDZM/0NlD+7Y2DhUGuAUdwDIL5lS3GPAD0HEayEcrhuLuRiPYOgFWZik+gsFzsykxSn0KO6jim7ev8kIig==" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.6.1/dist/css/foundation-rtl.min.css" integrity="sha256-wgkuX4RG+TO0/QoU8TisMBs4hRb6OnWZeIk30YpfWHE=" crossorigin="anonymous">
 ```
 
 <div class="text-center">

docs/pages/prototyping-utilities.md

@@ -34,7 +34,7 @@ Not all projects require Prototyping Utilities and adding utility classes like t
 	</p>
 </div>
 
-If you're using the CSS version of Foundation, you can generate a <a href="https://get.foundation/sites/download">custom download of Foundation</a> with prototype mode enabled. If you're using the Sass version of Foundation, you can enable prototype mode in two ways:
+You can enable prototype mode in two ways:
 
 If you use the `foundation-everything()` mixin in your main Sass file, just pass in `$prototype: true` to enable the prototype mode.
 

docs/pages/rtl.md

@@ -31,7 +31,7 @@ View of a [full list of language codes](https://www.loc.gov/standards/iso639-2/p
 
 ## CSS Download
 
-If you use a CSS version of Foundation (the ones you can find on the [download page](https://get.foundation/sites/download)), you'll need to create a custom download that includes RTL CSS instead of LTR. Just select "Right-to-left" under the Text Direction section of the customizer.
+If you use a CSS version of Foundation (the ones you can find on the [download page](http://localhost:3000/installation.html#download)), you'll need to create a custom download that includes RTL CSS instead of LTR. Just select "Right-to-left" under the Text Direction section of the customizer.
 
 ---
 

docs/pages/tabs.md

@@ -82,7 +82,7 @@ Put it all together, and we get this:
 
 ## Vertical Tabs
 
-Add the `.vertical` class to a tabstrip to stack tabs vertically. You can also place the tabstrip and the tab contents in a grid to make them sit side-by-side.
+Add the `.vertical` class to a tabstrip and tab contents to stack tabs vertically. You can also remove the `.grid-margin-x` class from the wrapping div to make them sit side-by-side.
 
 <p>
   <a class="" data-open-video="3:46"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
@@ -94,7 +94,7 @@ Add the `.vertical` class to a tabstrip to stack tabs vertically. You can also p
 
 ```html_example
 <div class="grid-container">
-  <div class="grid-x grid-margin-x">
+  <div class="grid-x">
     <div class="cell medium-3">
       <ul class="vertical tabs" data-tabs id="example-tabs">
         <li class="tabs-title is-active"><a href="#panel1v" aria-selected="true">Tab 1</a></li>
@@ -106,7 +106,7 @@ Add the `.vertical` class to a tabstrip to stack tabs vertically. You can also p
       </ul>
     </div>
     <div class="cell medium-9">
-      <div class="tabs-content" data-tabs-content="example-tabs">
+      <div class="tabs-content vertical" data-tabs-content="example-tabs">
         <div class="tabs-panel is-active" id="panel1v">
           <p>One</p>
           <p>Check me out! I'm a super cool Tab panel with text content!</p>

docs/partials/navigation.html

@@ -40,15 +40,15 @@
         <li><a href="https://zurb.com/university/courses">Courses</a></li>
         <li><a href="https://zurb.com/university/training">Custom Training</a></li>
         <li><a href="https://get.foundation/learn/certification.html">Certification</a></li>
-        <li><a href="https://get.foundation/learn/responsive-reading.html">Responsive Reading</a></li>
+
       </ul>
     </li>
 
     <li class="menu-item">
       <a href="https://get.foundation/get-involved/support.html">Get Involved</a>
       <ul class="menu vertical">
         <li><a href="https://get.foundation/get-involved/support.html">Connect</a></li>
-        <li><a href="https://get.foundation/get-involved/premium-support.html">PLZ Halp</a></li>
+
         <li><a href="https://foundation.discourse.group">Foundation Forum</a></li>
         <li><a href="https://get.foundation/learn/events.html">Events</a></li>
         <li><a href="https://get.foundation/get-involved/faq.html">FAQs</a></li>
@@ -63,7 +63,7 @@
       <a href="https://get.foundation/frameworks-docs.html">Docs</a>
       <ul class="menu vertical">
         <li><a target="_blank" href="https://get.foundation/sites/docs/">Sites Docs</a></li>
-        <li><a target="_blank" href="https://get.foundation/emails/docs">Emails Docs</a></li>
+        <li><a target="_blank" href="https://get.foundation/emails/docs/">Emails Docs</a></li>
       </ul>
     </li>
 

docs/partials/off-canvi.html

@@ -38,15 +38,13 @@
         <li><a href="https://get.foundation/learn/classes.html">Classes</a></li>
         <li><a href="https://get.foundation/learn/custom-training.html">Custom Training</a></li>
         <li><a href="https://get.foundation/learn/certification.html">Certification</a></li>
-        <li><a href="https://get.foundation/learn/responsive-reading.html">Responsive Reading</a></li>
       </ul>
     </li>
 
     <li>
       <a href="https://get.foundation/get-involved/support.html">Get Involved</a>
       <ul class="submenu menu vertical" data-submenu>
         <li><a href="https://get.foundation/get-involved/support.html">Connect</a></li>
-        <li><a href="https://get.foundation/get-involved/premium-support.html">PLZ Halp</a></li>
         <li><a href="https://foundation.discourse.group">Foundation Forum</a></li>
         <li><a href="https://get.foundation/learn/events.html">Events</a></li>
         <li><a href="https://get.foundation/get-involved/faq.html">FAQs</a></li>
@@ -58,8 +56,8 @@
     <li>
       <a href="https://get.foundation/frameworks-docs.html">Docs</a>
       <ul class="submenu menu vertical" data-submenu>
-        <li><a href="https://get.foundation/docs/" target="_blank">Sites Docs</a></li>
-        <li><a href="https://zurb.com/ink/docs.php" target="_blank">Email Docs</a></li>
+        <li><a target="_blank" href="https://get.foundation/sites/docs/">Sites Docs</a></li>
+        <li><a target="_blank" href="https://get.foundation/emails/docs/">Emails Docs</a></li>
       </ul>
     </li>
 

docslink.sh

@@ -134,8 +134,8 @@ gulp.task('customizer:zip', function (done) {
   var outputFolder = path.dirname(OUTPUT_DIR);
   var outputFileName = path.basename(OUTPUT_DIR);
 
-  fs.closeSync(fs.openSync(path.join(OUTPUT_DIR, 'css/app.css', 'w')));
-  fs.closeSync(fs.openSync(path.join(OUTPUT_DIR, 'js/app.js', 'w')));
+  fs.closeSync(fs.openSync(path.join(OUTPUT_DIR, 'css/app.css'), 'w'));
+  fs.closeSync(fs.openSync(path.join(OUTPUT_DIR, 'js/app.js'), 'w'));
   fs.writeFileSync(path.join(OUTPUT_DIR, 'js/app.js'), '$(document).foundation()\n');
 
   return gulp.src(path.join(OUTPUT_DIR, '/**/*'))

gulp/tasks/customizer.js

@@ -90,7 +90,7 @@ class Drilldown extends Plugin {
       var $link = $(this);
       var $sub = $link.parent();
       if(_this.options.parentLink){
-        $link.clone().prependTo($sub.children('[data-submenu]')).wrap('<li data-is-parent-link class="is-submenu-parent-item is-submenu-item is-drilldown-submenu-item" role="menuitem"></li>');
+        $link.clone().prependTo($sub.children('[data-submenu]')).wrap('<li data-is-parent-link class="is-submenu-parent-item is-submenu-item is-drilldown-submenu-item" role="none"></li>');
       }
       $link.data('savedHref', $link.attr('href')).removeAttr('href').attr('tabindex', 0);
       $link.children('[data-submenu]')

js/foundation.drilldown.js

@@ -58,8 +58,8 @@ class DropdownMenu extends Plugin {
     var subs = this.$element.find('li.is-dropdown-submenu-parent');
     this.$element.children('.is-dropdown-submenu-parent').children('.is-dropdown-submenu').addClass('first-sub');
 
-    this.$menuItems = this.$element.find('[role="menuitem"]');
-    this.$tabs = this.$element.children('[role="menuitem"]');
+    this.$menuItems = this.$element.find('li[role="none"]');
+    this.$tabs = this.$element.children('li[role="none"]');
     this.$tabs.find('ul.is-dropdown-submenu').addClass(this.options.verticalClass);
 
     if (this.options.alignment === 'auto') {
@@ -113,10 +113,12 @@ class DropdownMenu extends Plugin {
             || (_this.options.forceFollow && hasTouch)) {
             return;
           }
+          e.stopImmediatePropagation();
           e.preventDefault();
           _this._hide($elem);
         }
         else {
+          e.stopImmediatePropagation();
           e.preventDefault();
           _this._show($sub);
           $elem.add($elem.parentsUntil(_this.$element, `.${parClass}`)).attr('data-is-click', true);
@@ -150,7 +152,7 @@ class DropdownMenu extends Plugin {
             _this._show($elem.children('.is-dropdown-submenu'));
           }, _this.options.hoverDelay));
         }
-      }).on('mouseleave.zf.dropdownmenu', ignoreMousedisappear(function (e) {
+      }).on('mouseleave.zf.dropdownMenu', ignoreMousedisappear(function (e) {
         var $elem = $(this),
             hasSub = $elem.hasClass(parClass);
         if (hasSub && _this.options.autoclose) {
@@ -164,7 +166,7 @@ class DropdownMenu extends Plugin {
       }));
     }
     this.$menuItems.on('keydown.zf.dropdownMenu', function(e) {
-      var $element = $(e.target).parentsUntil('ul', '[role="menuitem"]'),
+      var $element = $(e.target).parentsUntil('ul', '[role="none"]'),
           isTab = _this.$tabs.index($element) > -1,
           $elements = isTab ? _this.$tabs : $element.siblings('li').add($element),
           $prevElement,

js/foundation.dropdownMenu.js

@@ -5,8 +5,9 @@ import $ from 'jquery';
 const Nest = {
   Feather(menu, type = 'zf') {
     menu.attr('role', 'menubar');
+    menu.find('a').attr({'role': 'menuitem'});
 
-    var items = menu.find('li').attr({'role': 'menuitem'}),
+    var items = menu.find('li').attr({'role': 'none'}),
         subMenuClass = `is-${type}-submenu`,
         subItemClass = `${subMenuClass}-item`,
         hasSubClass = `is-${type}-submenu-parent`,

js/foundation.util.nest.js

@@ -25,7 +25,8 @@
     "deploy": "gulp deploy --color",
     "deploy:prep": "gulp deploy:prep --color",
     "deploy:docs": "gulp deploy:docs --color",
-    "deploy:beta": "gulp deploy:beta --color"
+    "deploy:beta": "gulp deploy:beta --color",
+    "docs:link": "git clone https://github.com/foundation/foundation-docs && npm link ./foundation-docs"
   },
   "peerDependencies": {
     "jquery": ">=2.2.0",

package.json

@@ -12,7 +12,7 @@
 
         <projectUrl>https://get.foundation/sites</projectUrl>
         <iconUrl>https://get.foundation/assets/img/icons/foundation-favicon.ico</iconUrl>
-        <releaseNotes>https://github.com/foundation/foundation-sites/releases/tag/v6.5.3</releaseNotes>
+        <releaseNotes>https://github.com/foundation/foundation-sites/releases/tag/v6.6.1</releaseNotes>
         <licenseUrl>https://github.com/foundation/foundation-sites/blob/develop/LICENSE</licenseUrl>
         <copyright>Copyright 2017-2018</copyright>
         <repository type="git" url="https://github.com/foundation/foundation-sites"/>