Merge branch 'master' into develop

docs/assets/scss/_course-callout.scss

@@ -1,18 +1,25 @@
 .footer-course-upsell {
   overflow: hidden;
-  img {
-    position: absolute;
-    bottom: -15px;
-    animation:  ad-unit-hover 8s infinite ease;
-  }
   border-top: 1px solid #cacaca;
   background: #F5F5F5;
   padding-top: 10px;
   margin-top: 25px;
+
+  .sites-course {
+    position: relative;
+  }
+
+  img {
+    position: absolute;
+    bottom: -205px;
+    animation:  ad-unit-hover 8s infinite ease;
+  }
+
   .sites-course-title {
     font-size: 30px;
     margin-bottom: 1rem;
     margin-top: 1rem;
+
     span {
       text-transform: uppercase;
       font-size: rem-calc(11px);

docs/layout/default.html

@@ -78,5 +78,27 @@ <h5>Foundation 6 is here!</h5>
   <script src="assets/js/foundation.js"></script>
   <script src="assets/js/docs.js"></script>
   <script type="text/javascript" src="https://intercom.zurb.com/scripts/zcom.js"></script>
+  <script type="text/javascript">
+    !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+    n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+    n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
+    t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
+    document,'script','https://connect.facebook.net/en_US/fbevents.js');
+
+    fbq('init', '585552368271130');
+    fbq('track', "PageView");
+  </script>
+  <!-- Twitter universal website tag code -->
+  <script>
+    !function(e,t,n,s,u,a){e.twq||(s=e.twq=function(){s.exe?s.exe.apply(s,arguments):s.queue.push(arguments);
+    },s.version='1.1',s.queue=[],u=t.createElement(n),u.async=!0,u.src='//static.ads-twitter.com/uwt.js',
+    a=t.getElementsByTagName(n)[0],a.parentNode.insertBefore(u,a))}(window,document,'script');
+    // Insert Twitter Pixel ID and Standard Event data below
+    twq('init','nvkjx');
+    twq('track','PageView');
+  </script>
+  <!-- End Twitter universal website tag code -->
+
+
 </body>
 </html>

docs/pages/callout.md

@@ -71,13 +71,13 @@ Callouts can be sized using the `.small` and `.large` classes. These will affect
 
 ```html_example
 <div class="callout small">
-  <h5>This is a secondary panel</h5>
+  <h5>This is a small callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
 
 <div class="callout large">
-  <h5>This is a secondary panel</h5>
+  <h5>This is a large callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>

docs/pages/drilldown-menu.md

@@ -1,5 +1,5 @@
 ---
-title: Drilldown Menu
+title: Drilldown
 description: Drilldown is one of Foundation's three menu patterns, which converts a series of nested lists into a vertical drilldown menu.
 scss: scss/components/_drilldown.scss
 js: js/foundation.drilldown.js

docs/pages/equalizer.md

@@ -96,9 +96,9 @@ If you have a gallery of items that wrap multiple times, Equalizer can be config
 
 ```html
 <div class="row small-up-1 medium-up-2 large-up-4" data-equalizer data-equalize-by-row="true">
-  <div class="column"></div>
-  <div class="column"></div>
-  <div class="column"></div>
+  <div class="column" data-equalizer-watch></div>
+  <div class="column" data-equalizer-watch></div>
+  <div class="column" data-equalizer-watch></div>
   <!-- ... -->
 </div>
 ```

docs/pages/interchange.md

@@ -85,5 +85,11 @@ When using Interchange programmatically, you need to pass in your ruleset in the
 
 ```js
 var $photoFrame = $('#some-container');
-var interchange = new Foundation.Interchange($photoFrame, {rules: "[path/to/default.jpg, small], [path/to/medium.jpg, medium], [path/to/large.jpg, large]"});
+var interchange = new Foundation.Interchange($photoFrame, {
+  rules: [
+    "[path/to/default.jpg, small]", 
+    "[path/to/medium.jpg, medium]",
+    "[path/to/large.jpg, large]"
+  ]
+ });
 ```

docs/pages/javascript-utilities.md

@@ -16,7 +16,7 @@ One of the useful libraries is `Foundation.Box`, and it has a couple methods des
 
 var dims = Foundation.Box.GetDimensions(element);
 ```
-Will return an object that contains the dimensions of the `element` passed. The object return looks like:
+Will return an object that contains the dimensions of `element`. The object return looks like:
 
 ```js
 
@@ -36,7 +36,7 @@ Will return an object that contains the dimensions of the `element` passed. The
 }
 ```
 
-Also included is the `ImNotTouchingYou` function. It returns a boolean based on whether the element you pass it is colliding with the edge of the window, or optionally, a parent element. The other two options are for detecting collisions on only one axis, and are simply booleans you pass in.
+Also included is the `ImNotTouchingYou` function. It returns a boolean based on whether the passed `element` is colliding with the edge of the window (default), or a parent element. The remaining two options are booleans for limiting collision detection to only one axis.
 ```js
 
 var clear = Foundation.Box.ImNotTouchingYou(element [, parent, leftAndRightOnly, topAndBottomOnly]);
@@ -45,14 +45,14 @@ var clear = Foundation.Box.ImNotTouchingYou(element [, parent, leftAndRightOnly,
 ## Keyboard
 `js/foundation.util.keyboard.js`
 
-Another quite useful library, `Foundation.Keyboard` has several methods to make keyboard event interaction easier for all. Shout out to [Marius Olbertz](http://www.mariusolbertz.de/) of Germany who conceived and coded this library.
+Another quite useful library, `Foundation.Keyboard` has several methods to make keyboard event interaction easier for all. Shout out to [Marius Olbertz](http://www.mariusolbertz.de) of Germany who conceived and coded this library.
 
 Ever wanted a handy list of common keycodes and the keys they represent? Use `Foundation.Keyboard.keys`. This is an object containing key/value pairs of the most frequently used keys in our framework.
 
 Want to manage your own keyboard inputs? No problem! Within your `.on('key**')` callback, call `Foundation.Keyboard.parseKey(event)` to get a string of what key was pressed, e.g. `'TAB'` or `'ALT_X'`.
-You can also use this function outside of the Foundation components in your own JavaScript code.
+(You can also use this function outside of the Foundation components, in your own JavaScript code!)
 
-What if you want to know if there's focusable elements somewhere on a page? Instead of writing that function and selector yourself, just use:
+What if you want to know if there's focusable elements somewhere on a page? Instead of writing your own function and selector from scratch, just use:
 ```js
 var focusable = Foundation.Keyboard.findFocusable($('#content'));
 ```
@@ -79,9 +79,9 @@ Foundation.Keyboard.handleKey(event, 'pluginName', {
   }
 });
 ```
-There are also the functions `handled` and `unhandled` where you can place any code that shall always be executed after the key event has been handled or not.
+There are also the functions `handled` and `unhandled`, where you can place any code that shall always be executed after the key event has been handled (or not).
 
-If you want to use your own key bindings, you can simply call the `Foundation.Keyboard.register` function even after Foundation has been initialized.
+If you want to use your own key bindings, simply call the `Foundation.Keyboard.register` function. It even works after Foundation has already initialized.
 
 ## MediaQuery
 `js/foundation.util.mediaQuery.js`
@@ -99,7 +99,7 @@ Foundation.MediaQuery.current;
 // a string of the current breakpoint size.
 ```
 
-Also included is an event emitter for breakpoint changes. You can hook into this event with
+Also included is an event emitter for breakpoint changes. You can hook into this event with:
 ```js
 
 $(window).on('changed.zf.mediaquery', function(event, newSize, oldSize){});
@@ -110,26 +110,26 @@ $(window).on('changed.zf.mediaquery', function(event, newSize, oldSize){});
 
 Two handy utilities, one little file.
 
-Foundation.Motion is the same JavaScript used by the [Motion-UI](https://github.com/zurb/motion-ui) library, and is included in Foundation 6. See the GitHub page for more details.
+`Foundation.Motion` is the same JavaScript used by the [Motion-UI](https://github.com/zurb/motion-ui/) library, and is included in Foundation 6. See the GitHub page for more details.
 
-Foundation.Move is a simple helper function for utilizing browsers' `requestAnimationFrame` method for hardware acceleration. Invoke like so:
+`Foundation.Move` is a simple helper function for utilizing browsers' `requestAnimationFrame` method for hardware acceleration. Invoke like so:
 ```js
 Foundation.Move(durationInMS, $element, function(){
   //animation logic
 });
 ```
-Your jQuery element will fire `finished.zf.animate` when the animation is complete.
+When the animation is complete, your jQuery element will fire `finished.zf.animate`.
 
 ## Timer & Images Loaded
 `js/foundation.util.timerAndImageLoader.js`
 
-Both functions are used by [Orbit](orbit.html) and can be useful elsewhere as well.
+Both functions are used by [Orbit](orbit.html), and can be useful elsewhere as well.
 ```js
 
 var timer = new Foundation.Timer($element, {duration: ms, infinite: bool}, callback);
 // includes: timer.start(), timer.pause(), timer.restart()
 ```
-Similar to `setInterval`, except you can pause and pick back up where you left off.
+Similar to `setInterval`, except you can pause and resume where you left off.
 
 ```js
 Foundation.onImagesLoaded($images, callback);
@@ -139,7 +139,7 @@ This will execute your callback function after all the images in your jQuery col
 ## Touch
 `js/foundation.util.touch.js`
 
-Gives you the ability to add swipe and psuedo-drag events to elements.
+Allows you to add `swipe*` and psuedo-drag events to elements.
 
 ```js
 $('selector').addTouch().on('mousemove', handleDrag);
@@ -151,7 +151,7 @@ $('selector').spotSwipe().on('swipeleft', handleLeftSwipe);
 ## Triggers
 `js/foundation.util.triggers.js`
 
-Provides a number of event listeners and triggers your script can hook into. Most of them are self-explanatory, and utilized in many Foundation plugins.
+Provides a number of event listeners and triggers your script can hook into. Most are self-explanatory, and used in many Foundation plugins.
 ```html
 <button data-open='someId'>I open something!</button>
 <button data-close='someId'>I close something!</button>
@@ -180,8 +180,8 @@ $('#someId').on('resizeme.zf.trigger', handleResize);
 
 Foundation includes a couple useful features in the core library that are used in many places, that you can tap into.
 
-`Foundation.GetYoDigits([number, namespace])` returns a base-36, psuedo-random string with a hyphenated namespace (if you include one). Both arguments are optional, it will by default return a string six characters long.
+`Foundation.GetYoDigits([number, namespace])` returns a base-36, psuedo-random string with a hyphenated namespace (if you include one). Both arguments are optional; by default, it will return a string six characters long.
 
-`Foundation.getFnName(fn)` returns a string representation of a named function. Seems small, but believe us, it's useful.
+`Foundation.getFnName(fn)` returns a string representation of a named function. Seems small, but believe us—it's useful.
 
-`Foundation.transitionend()` is a function<span data-tooltip title="Goodbye ZURB, I'll miss you"> </span>that returns the string of the properly vendor-prefixed version of `transitionend` events. Most browsers don't require a prefix these days, but for those that do, we've got you covered. But IE 9 doesn't support transitions?? Quite right you are! In that case our plugins that use transitions will simply snap to whatever location or visibility state they were headed to, and this function will fire a `transitionend` event manually on the element you passed. It still gives the desired results, and allows Motion-UI to work in IE 9.
+`Foundation.transitionend()` is a function<span data-tooltip title="Goodbye ZURB, I'll miss you"> </span> that returns the string of the properly vendor-prefixed version of `transitionend` events. Most browsers don't require a prefix these days, but for those that do, we've got you covered. But IE 9 doesn't support transitions?? Quite right you are! In that case, our plugins that use transitions will simply snap to whatever location or visibility state they were headed to, and this function will fire a `transitionend` event manually on the element you passed. It still gives the desired results, and allows Motion-UI to work in IE 9.

docs/partials/footer.html

@@ -47,10 +47,8 @@ <h3>Foundation for Sites</h3>
           <div class="learn-links">
             <h4 class="hide-for-small">Want more?</h4>
             <ul>
-              <li><a href="http://foundation.zurb.com/apps">Foundation for Apps</a></li>
-              <li><a href="http://zurb.com/ink/">Ink Responsive Emails</a></li>
-              <li><a href="http://zurb.com/notable">Notable Design Apps</a></li>
-              <li><a href="http://zurb.com/university/courses">Training</a></li>
+              <li><a href="http://foundation.zurb.com/emails.html">Foundation for Emails</a></li>
+              <li><a href="http://zurb.com/university/courses">Foundation Training</a></li>
               <li><a href="http://zurb.com/library">Design Resources</a></li>
             </ul>
           </div>
@@ -72,51 +70,27 @@ <h4 class="hide-for-small">Stay Updated</h4>
       </div>
     </div>
   </div>
-  <div class="row global">
-    <div class="medium-3 small-6 columns">
-      <a href="http://zurb.com/studios" class="footer-link-block services">
-        <span class="title">Studios</span>
-        <span>Helping more than 200 startups succeed since 1998.</span>
-      </a>
-    </div>
-    <div class="medium-3 small-6 columns">
-      <a href="http://foundation.zurb.com/" class="footer-link-block foundation">
-        <span class="title">Foundation</span>
-        <span>The most advanced front-end framework in the world.</span>
-      </a>
-    </div>
-    <div class="medium-3 small-6 columns">
-      <a href="http://zurb.com/notable" class="footer-link-block apps">
-        <span class="title">Notable Design Apps</span>
-        <span>Prototype, iterate and collect feedback on your products.</span>
-      </a>
-    </div>
-    <div class="medium-3 small-6 columns">
-      <a href="http://zurb.com/university" class="footer-link-block expo">
-        <span class="title">University</span>
-        <span>Ideas, thoughts and design resources shared with you.</span>
-      </a>
-    </div>
-  </div>
+
 </div>
 
 <div class="zurb-footer-bottom">
   <div class="row">
     <div class="medium-4 medium-push-8 columns">
       <ul class="home-social">
-          <li><a href="http://www.twitter.com/ZURB" class="twitter"></a></li>
-          <li><a href="http://www.facebook.com/ZURB" class="facebook"></a></li>
-          <li><a href="http://zurb.com/contact" class="mail"></a></li>
-        </ul>
-     </div>
-     <div class="medium-8 medium-pull-4 columns">
-        <a href="http://www.zurb.com" class="zurb-logo regular"></a>
-        <ul class="zurb-links">
-          <li><a href="http://zurb.com/about">About</a></li>
-          <li><a href="http://zurb.com/blog">Blog</a></li>
-          <li><a href="http://zurb.com/news">News<span class="show-for-medium-up"> &amp; Events</span></a></li>
-          <li><a href="http://zurb.com/contact">Contact</a></li>
-          <li><a href="http://zurb.com/sitemap">Sitemap</a></li>
+        <li><a href="http://www.youtube.com/ZURB" class="youtube"></a></li>
+        <li><a href="http://www.twitter.com/ZURB" class="twitter"></a></li>
+        <li><a href="http://www.facebook.com/ZURB" class="facebook"></a></li>
+        <li><a href="http://zurb.com/contact" class="mail"></a></li>
+      </ul>
+    </div>
+    <div class="medium-8 medium-pull-4 columns">
+      <a href="http://www.zurb.com" class="zurb-logo regular"></a>
+      <ul class="zurb-links">
+        <li><a href="http://zurb.com/about">About</a></li>
+        <li><a href="http://zurb.com/blog">Blog</a></li>
+        <li><a href="http://zurb.com/news">News<span class="show-for-medium-up"> &amp; Events</span></a></li>
+        <li><a href="http://zurb.com/contact">Contact</a></li>
+        <li><a href="http://zurb.com/sitemap">Sitemap</a></li>
        </ul>
        <p class="copyright">&copy; 1998&dash;2016 ZURB, Inc. All rights reserved.</p>
     </div>

docs/partials/navigation.html

@@ -24,7 +24,6 @@
         <li class="title">Frameworks</li>
         <li><a href="http://foundation.zurb.com/sites.html">Foundation for Sites</a></li>
         <li><a href="http://foundation.zurb.com/emails.html">Foundation for Email</a></li>
-        <li><a href="http://foundation.zurb.com/apps.html">Foundation for Apps</a></li>
         <li class="divider"></li>
         <li class="title">Develop</li>
         <li><a href="http://foundation.zurb.com/templates.html">HTML Templates</a></li>
@@ -38,8 +37,9 @@
       <a href="http://foundation.zurb.com/learn/tutorials.html">Tutorials</a>
       <ul class="submenu menu vertical" data-submenu>
         <li><a href="http://foundation.zurb.com/learn/tutorials.html">Tutorials</a></li>
-        <li><a href="http://foundation.zurb.com/learn/classes.html">Classes</a></li>
-        <li><a href="http://foundation.zurb.com/learn/custom-training.html">Custom Training</a></li>
+        <li><a href="http://zurb.com/university/lessons">Lessons</a></li>
+        <li><a href="http://zurb.com/university/courses">Courses</a></li>
+        <li><a href="http://zurb.com/university/training">Custom Training</a>
         <li><a href="http://foundation.zurb.com/learn/certification.html">Certification</a></li>
         <li><a href="http://foundation.zurb.com/learn/responsive-reading.html">Responsive Reading</a></li>
       </ul>
@@ -63,7 +63,6 @@
       <ul class="submenu menu vertical" data-submenu>
         <li><a href="http://foundation.zurb.com/docs/" target="_blank">Sites Docs</a></li>
         <li><a href="http://foundation.zurb.com/sites/docs/v/5.5.3/" target="_blank">F5 Docs</a></li>
-        <li><a href="http://foundation.zurb.com/apps/docs/#!/" target="_blank">Apps Docs</a></li>
         <li><a href="http://foundation.zurb.com/emails/docs/" target="_blank">Email Docs</a></li>
       </ul>
     </li>

docs/partials/off-canvi.html

@@ -22,7 +22,6 @@
         <li class="title">Frameworks</li>
         <li><a href="http://foundation.zurb.com/sites.html">Foundation for Sites</a></li>
         <li><a href="http://foundation.zurb.com/emails.html">Foundation for Email</a></li>
-        <li><a href="http://foundation.zurb.com/apps.html">Foundation for Apps</a></li>
         <li class="divider"></li>
         <li class="title">Develop</li>
         <li><a href="http://foundation.zurb.com/templates.html">HTML Templates</a></li>
@@ -61,7 +60,6 @@
       <a href="http://foundation.zurb.com/frameworks-docs.html">Docs</a>
       <ul class="submenu menu vertical" data-submenu>
         <li><a href="http://foundation.zurb.com/docs/" target="_blank">Sites Docs</a></li>
-        <li><a href="http://foundation.zurb.com/apps/docs/#!/" target="_blank">Apps Docs</a></li>
         <li><a href="http://zurb.com/ink/docs.php" target="_blank">Email Docs</a></li>
       </ul>
     </li>

js/foundation.slider.js

@@ -13,9 +13,9 @@
 
 class Slider {
   /**
-   * Creates a new instance of a drilldown menu.
+   * Creates a new instance of a slider control.
    * @class
-   * @param {jQuery} element - jQuery object to make into an accordion menu.
+   * @param {jQuery} element - jQuery object to make into a slider control.
    * @param {Object} options - Overrides to the default plugin settings.
    */
   constructor(element, options) {