Merge tag 'v3.2.2' into vertical-rhythm

Version 3.2.2

Conflicts:
	scss/foundation/_settings.scss
	scss/foundation/common/_forms.scss
	scss/foundation/common/_typography.scss
	scss/foundation/components/_grid.scss
	scss/foundation/components/modules/_tabs.scss
	scss/foundation/components/modules/_topbar.scss
	scss/foundation/components/modules/_ui.scss
	test/forms.html

.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p194

CHANGELOG.md

@@ -0,0 +1,92 @@
+# Changelog
+We'll keep you up to date with what we've released so you at least have a gist of what goes into each update. For the most part, we'll try to list things out as detailed as we see necessary.
+
+---
+
+### 3.2.2- November 10, 2012
+This patch fixes a typo found in the tabs plugin.
+
+### 3.2.1- November 9, 2012
+This patch include bug fixes for various elements, such as:
+* Adding a missing line for mqueries.scss into app.scss
+* Height of fixed magellan element
+* Update viewport tag with initial-scale
+* Dropdown button fixes
+* Clearing bug fixes
+* Added a font-smoothing variable
+* Added close support to accordions
+* Removed deep linking hashes from tabs
+* Topbar now resets on close for small layouts
+
+### **3.2**- October 26, 2012
+With this update we've revamped our documentation to be more organized and explain details regarding Scss, Compass and Javascripts.
+
+The updates to Foundation itself are as follows:
+* Added [Magellan](http://foundation.zurb.com/docs/magellan.php), a plugin for building design agnostic sticky navs that know where you are on the page.
+* Added [Joyride](http://foundation.zurb.com/docs/joyride.php), our plugin for creating tours of your website or app.
+* Added [Clearing](http://foundation.zurb.com/docs/clearing.php), our new responsive image gallery lightbox plugin.
+* Cleaned up Orbit a bit. We now use opacity on each slide so you don't have stacking problems or different image size problems. You can now optionally stack slides on mobile. Orbit can now be swipable on mobile as well.
+* Updated Reveal
+* Updated index files to use defined header and footer structure
+* Cleaned up some Compass included
+* RTL for ui and navbar.
+* Tabs can now use unordered lists or definition lists, replacing the definition title with an li.section-title.
+* Added definition list styles.
+* Added mobile-#-up classes to use in conjunction with regular block-grid classes for a different mobile grid.
+* Updated block grids to be really flexible and customizable based on a variable.
+* Added better responsive styling for tooltips.
+* Separated all media queries into their own file for easy droppping.
+* Updated modular scale to use new functions, doesn't effect end-users.
+* Updated visibility classes to use inherit instead of block to accomodate for spans.
+* Removed HTML5 Shiv from header since its included in modernizr.
+* Added [pricing tables](http://foundation.zurb.com/docs/elements.php#pricing-tables) UI element
+* Added many new Scss variables to control styling for things like: topbar, clearing, joyride, pricint tables, etc.
+* Bug fixes for Topbar.
+* Added 5 [HTML templates](http://foundation.zurb.com/templates.php) to the add-ons section.
+
+### 3.1.1- September 19, 2012
+Updating Top Bar navigation implementation pattern to wrap `.contain-to-grid` and/or `.fixed` around the `nav` element to prevent horizontal scroll bars when using `.contain-to-grid`. Updated the topBar breakpoint option so users only need to update the Scss variable.
+
+### **3.1**- September 14, 2012
+Launched new features, a new Add-ons section to the marketing site, Right to left language support, and fixed bugs.
+
+With this release of Foundation, we include:
+* Downloadable HTML template pages that can be copy/pasted into an existing project or added to your project upon downloading from the customizer.
+* The Add-on's section includes a round-up of all the playground pieces, etc that aren't officially included in Foundation, but built to work with it. This includes: [Templates](http://foundation.zurb.com/templates.php), [Icon Fonts](http://foundation.zurb.com/icon-fonts.php), [Off-Canvas Layouts](http://foundation.zurb.com/off-canvas.php), [Responsive Tables](http://foundation.zurb.com/responsive-tables.php), [SVG Social Icons](http://foundation.zurb.com/social-icons.php), and [Omnigraffle Stencils](http://foundation.zurb.com/stencils.php).
+* Foundation now includes a [responsive top navigation](http://foundation.zurb.com/navigation.php) bar that lets you have control over when it responds and what you include in it. We've made it really easy to customize using Scss.
+* Right-to-left language support straight out of the box. You can adjust this in the settings.scss file or upon downloading with the customizer.
+* New UI Styles for Progress Bars and Image Thumbs.
+* Updated to include jQuery 1.8.1
+* Orbit thumbnail documentation.
+* Better Reveal size documentation.
+
+### 3.0.9- August 14, 2012
+Bug fixes and locking down dependencies.
+
+### 3.0.8- August 10, 2012
+Numerous bugfixes. Added media query toggle plugin. Removed marketing site from repository and included a new `test/` directory to help contributors test patches.
+
+New features: Media Query Toggler, block-grid mobile layouts, font-size customizer options and included modular scale gem as dependancy for SCSS version.
+
+### 3.0.7- July 30, 2012
+Numerous JS bug fixes, added generators for Rails and refactored SCSS directory for better maintainability and scalability over time. CSS files weren't affected by this refactoring.
+
+### 3.0.6- July 20, 2012
+Numerous bugfixes including dropdown buttons on touch devices, Modernizr update with IE8Compat, split button colors, and more. Split out the functions in app.js to be part of the Gem and only initialized in app.js, so you can keep a clean distinction between your JS and Foundation's (if you want to). Added an [accordion](http://foundation.zurb.com/elements.php) element.
+
+### 3.0.5- July 10, 2012
+Fixed Compass performance issues by separating out each Foundation file and removing extraneous imports.
+
+### 3.0.4- July 6, 2012
+Fixed a number of bugs around the Sass/Gem installs and documentation. Some smaller items:
+* Fixed a bug with dropdown buttons to allow clicking on their anchors again.
+* Added styles for HTML5 (and other) input styles, not just text.
+* Added error states back to the forms documentation.
+* Flyouts in a nav bar can now expand up as well as down.
+* In SCSS you can now set $base-size correctly, but we're still working to correct modifying the $ratio variable.
+
+### 3.0.1 to 3.0.3- July 2 to July 4, 2012
+Various bug fixes with the downloader, gem, and Sass install.
+
+### **3.0**- June 30, 2012
+Initial launch of Foundation 3, deprecating Foundation 2.2.1. Major enhancements include Sass/SCSS development, new grid system with box-sizing: border-box, new form styles, new UI elements, retooled download and install options, new docs, new marketing site.

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zurb-foundation (3.1.1)
+    zurb-foundation (3.2.2)
       compass (>= 0.12.2)
       modular-scale (>= 1.0.2)
       rake

README.md

@@ -3,9 +3,9 @@ Welcome to Foundation
 
 Foundation is the most advanced responsive front-end framework in the world. With Foundation you can quickly prototype and build sites or apps that work on any kind of device, with tons of included layout constructs (like a full responsive grid), elements and best practices.
 
-Homepage:      http://foundation.zurb.com  
-Documentation: http://foundation.zurb.com/docs  
-Download:      http://foundation.zurb.com/download.php  
+Homepage:      http://foundation.zurb.com
+Documentation: http://foundation.zurb.com/docs
+Download:      http://foundation.zurb.com/download.php
 
 Foundation is MIT-licensed and absolutely free to use. Foundation wouldn't be possible without the support of the entire ZURB team, our friends and colleagues who gave feedback, and some luminaries who did some heavy lifting that we took advantage of (thanks guys).
 
@@ -34,10 +34,12 @@ WordPress
 * [Starter Theme](https://github.com/drewsymo/Foundation) by Drew Morris
 * [Reverie](http://themefortress.com/reverie/) by Zhen
 * [WP-Foundation](http://320press.com/wp-foundation/features/) by 320press
+* [Yeti](https://github.com/modlearning/Yeti) by Modular Learning
 
 Joomla
 
 * [Joomla Template](https://github.com/meridiansoftech/joomla_foundation_template) by Arnold Mwumva Ford, Meridian Softech
+* [Joomla Template](https://github.com/antonydoyle/siegeengine) by Antony Doyle, Siege21
 
 Drupal
 
@@ -57,7 +59,8 @@ MODX
 
 .NET
 
-* [NuGet Package for ASP.Net MVC](http://www.nuget.org/packages/Zurb_Foundation_MVC3) by Edward Charbeneau, @EdCharbeneau
+* [NuGet Package for ASP.Net MVC](http://www.nuget.org/packages/Foundation3_MVC4) by Edward Charbeneau, @EdCharbeneau
+
 
 CodeIgniter
 
@@ -90,6 +93,10 @@ Modular Scale
 
 * [Modular Scale](https://github.com/scottkellum/modular-scale) by Mason Wendell and Scott Kellum
 
+Ruby on Rails SASS Gems
+
+* [Foundation Icons 2](https://github.com/zaiste/foundation-icons-sass-rails) by J. P. Nowak
+
 MIT Open Source License
 =======================
 

index.html

@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 
 <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
-<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
 <!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <head>
@@ -18,11 +16,6 @@
 
   <script src="vendor/assets/javascripts/foundation/modernizr.foundation.js"></script>
 
-  <!-- IE Fix for HTML5 Tags -->
-  <!--[if lt IE 9]>
-    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-
 </head>
 <body>
 

lib/foundation/generators/USAGE

@@ -3,7 +3,7 @@ Description:
 
 Example:
   rails g foundation:install
-  
+
   This will replace the default application assets:
     /app/assets/javascripts/application.js
     /app/assets/stylesheets/application.css

lib/foundation/generators/layout_generator.rb

@@ -7,21 +7,22 @@ class LayoutGenerator < Rails::Generators::Base
       argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
 
       class_option :haml, :desc => 'Generate HAML layout instead of ERB.', :type => :boolean
-
+      class_option :slim, :desc => 'Generate Slim layout instead of ERB.', :type => :boolean
+
       def create_layout
         if options.haml?
           template 'application.html.haml', "app/views/layouts/#{file_name}.html.haml"
-        elsif
+        elsif options.slim?
           template 'application.html.slim', "app/views/layouts/#{file_name}.html.slim"
         else
           template 'application.html.erb', "app/views/layouts/#{file_name}.html.erb"
         end
       end
-      
+
       private
         def file_name
           layout_name.underscore.downcase
         end
     end
   end
-end
+end

lib/foundation/version.rb

@@ -1,3 +1,3 @@
 module Foundation
-  VERSION = "3.1.1"
+  VERSION = "3.2.2"
 end

marketing/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p194

scss/foundation.scss

@@ -1,5 +1,4 @@
 @charset "UTF-8";
-
 // Foundation Features
 // =============
 
@@ -16,3 +15,6 @@
 @import "foundation/common/base";
 
 @import "foundation/components/grid", "foundation/components/modules/all";
+
+// Media Queries Overrides
+@import "foundation/components/modules/mqueries";