Merge branch 'master' of github.com:zurb/foundation

README.md

@@ -33,6 +33,7 @@ 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
 
 Joomla
 
@@ -85,6 +86,10 @@ Grid displayer
 * [Grid displayer bookmarklet](http://alefeuvre.github.com/foundation-grid-displayer/) by [Antoine Lefeuvre](http://twitter.com/jiraisurfer)
 * [Responsive Design Bookmarklet](http://responsive.victorcoulon.fr/) by [Victor Coulon](https://twitter.com/_victa)
 
+Modular Scale
+
+* [Modular Scale](https://github.com/scottkellum/modular-scale) by Mason Wendell and Scott Kellum
+
 MIT Open Source License
 =======================
 

foundation.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Foundation::VERSION
 
   gem.add_dependency "compass", [">= 0.12.2"]
-  gem.add_dependency "sass", [">= 3.2.0.alpha.244"]
+  gem.add_dependency "sass", [">= 3.2.0"]
   gem.add_dependency "modular-scale", [">= 1.0.0"]
   gem.add_dependency "rake"
 end

templates/project/scss/app.scss

@@ -13,16 +13,16 @@
 // @import "foundation/functions/all";
 // @import "foundation/common/globals";
 // @import "foundation/mixins/clearfix";
+// @import "modular-scale";
 
 // Control which mixins you have access too
 
 // @import "foundation/mixins/css-triangle";
 // @import "foundation/mixins/font-size";
 
-// Must include next three for semantic grid to work
+// Must include next two for semantic grid to work
 
 // @import "foundation/mixins/respond-to";
-
 // @import "foundation/mixins/semantic-grid";
 
 // Must include the grid for any responsiveness

test/forms.html

@@ -43,7 +43,32 @@ <h2>Foundation Forms Testing</h2>
   <!-- Test Foundation Components Here -->
   <div class="row">
     <div class="twelve columns">
-
+      <form class="custom">
+<div class="row collapse">
+<div class="eight mobile-three columns">
+<input type="text" />
+</div>
+<div class="four mobile-one columns">
+<a href="#" class="postfix button">Buscar</a>
+</div>
+</div>
+<div class="row">
+<div class="six columns">
+<label for="radio1">
+<input name="radio1" type="radio" id="radio1"
+checked="checked" style="display:none;">
+<span class="custom radio"></span> RB1
+</label>
+</div>
+<div class="six columns">
+<label for="radio2">
+<input name="radio1" type="radio" id="radio2"
+style="display:none;">
+<span class="custom radio"></span> RB2
+</label>
+</div>
+</div>
+</form>
       <a name="general"></a>
       <h3>Forms</h3>
       <h4 class="subheader">We set out in Foundation 3 to create an easy to handle, powerful, and versatile form layout system. A combination of form styles and the Foundation grid means you can do basically anything.</h4>