Merge branch 'master' into docs/update-equalizer-grid-examples

diff --cc docs/pages/abide.md
Simple merge

diff --cc docs/pages/installation.md
index 2831579f8cd7e164873377ccf49485b848f5cd93,3b2f61a18f60e1e6f9fb2ad183706dbbcec30cc5..843ddd6adba8f883b983a62ad332fd0c165e0bac
--- 1/docs/pages/installation.md
--- 2/docs/pages/installation.md
+++ b/docs/pages/installation.md
@@@ -48,7 -48,20 +48,20 @@@ Foundation is available on npm, Bower, 
      </div>
    </div>
  
 -  <div class="column small-2 text-right">
++  <div class="cell small-2 text-right">
+     <a href="https://rubygems.org/gems/foundation-rails">
+       <img class="docs-install-vendor-icon" src="{{root}}assets/img/icons/logo-rubygems.svg" alt="Ruby Gems">
+     </a>
+   </div>
+   <div class="column small-10">
+     <div class="docs-code">
+       <code class="bash">
+         gem install foundation-rails
+       </code>
+     </div>
+   </div>
+ 
 -  <div class="column small-2 text-right">
 +  <div class="cell small-2 text-right">
      <a href="https://atmospherejs.com/zurb/foundation-sites">
        <img class="docs-install-vendor-icon" src="{{root}}assets/img/icons/logo-meteor.svg" alt="Meteor">
      </a>

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

diff --cc docs/pages/tabs.md
Simple merge

diff --cc docs/pages/thumbnail.md
index 23fad1d35e207ac74e69015fea1671234aac8e43,e52e4f6ab7ea3d473c5f6f4a583e6612943518a1..8fd827675cef50042389dd12b57eac9437ea3fef
--- 1/docs/pages/thumbnail.md
--- 2/docs/pages/thumbnail.md
+++ b/docs/pages/thumbnail.md
@@@ -21,15 -21,14 +21,14 @@@ The `.thumbnail` class can be applied d
  <img class="thumbnail" src="assets/img/thumbnail/03.jpg" alt="Photo of Pluto.">
  ```
  
- 
 -<div class="row">
 -  <div class="small-4 columns text-center">
 +<div class="grid-x grid-margin-x">
-   <div class="cell small-4">
++  <div class="cell small-4 text-center">
      <img class="thumbnail" src="assets/img/thumbnail/01.jpg" alt="Photo of Uranus.">
    </div>
-   <div class="cell small-4">
 -  <div class="small-4 columns text-center">
++  <div class="cell small-4 text-center">
      <a href="#" class="thumbnail"><img src="assets/img/thumbnail/02.jpg" alt="Photo of Neptune."></a>
    </div>
-   <div class="cell small-4">
 -  <div class="small-4 columns text-center">
++  <div class="cell small-4 text-center">
      <img class="thumbnail" src="assets/img/thumbnail/03.jpg" alt="Photo of Pluto.">
    </div>
  </div>

diff --cc docs/pages/toggler.md
Simple merge

diff --cc docs/pages/tooltip.md
index 7663ff4a4bbb11f825292a92361eeeab0ea9b3d2,01408594f244f83788041d7e5fdc25b21571c421..2c4a80213039d4174118396bf154dc6561dc2a3f
--- 1/docs/pages/tooltip.md
--- 2/docs/pages/tooltip.md
+++ b/docs/pages/tooltip.md
@@@ -136,39 -132,39 +132,39 @@@ These dropdowns sets various positionin
  </button>
  ```
  
 -<div class="row small-up-1 medium-up-3">
 -  <div class="column">
 +<div class="grid-x grid-margin-x small-up-1 medium-up-3">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="bottom" data-alignment="left">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="bottom" data-alignment="left">
        Bottom Left
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button"  data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="bottom" data-alignment="center">
+     <button class="button" type="button"  data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="bottom" data-alignment="center">
        Bottom Center
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="bottom" data-alignment="right">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="bottom" data-alignment="right">
        Bottom Right
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="top" data-alignment="left">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="top" data-alignment="left">
        Top Left
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="top" data-alignment="center">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="top" data-alignment="center">
        Top Center
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="top" data-alignment="right">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="top" data-alignment="right">
        Top Right
      </button>
    </div>
@@@ -204,36 -200,36 +200,36 @@@
  </button>
  ```
  
 -<div class="row small-up-1 medium-up-2">
 -  <div class="column">
 +<div class="grid-x grid-margin-x small-up-1 medium-up-2">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="right" data-alignment="top">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="right" data-alignment="top">
        Right Top
      </button>
    </div>
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="left" data-alignment="top">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="left" data-alignment="top">
        Left Top
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="right" data-alignment="center">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="right" data-alignment="center">
        Right Center
      </button>
    </div>
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="left" data-alignment="center">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="left" data-alignment="center">
        Left Center
      </button>
    </div>
  
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="right" data-alignment="bottom">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="right" data-alignment="bottom">
        Right Bottom
      </button>
    </div>
 -  <div class="column">
 +  <div class="cell">
-     <button class="button" type="button" data-tooltip aria-haspopup="true" class="has-tip" data-disable-hover="false" tabindex="1" title="Fancy word for a beetle." data-position="left" data-alignment="bottom">
+     <button class="button" type="button" data-tooltip tabindex="1" title="Fancy word for a beetle." data-position="left" data-alignment="bottom">
        Left Bottom
      </button>
    </div>