zurb-foundation 3.2.0 → 3.2.2

data/CHANGELOG.md

@@ -3,6 +3,21 @@ We'll keep you up to date with what we've released so you at least have a gist o
 
 ---
 
+### 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.
 

data/README.md

@@ -34,6 +34,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
+* [Yeti](https://github.com/modlearning/Yeti) by Modular Learning
 
 Joomla
 

data/lib/foundation/version.rb

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

data/scss/foundation/_settings.scss

@@ -23,6 +23,7 @@ $darkEdge: rgba(#000, .2) !default;
 
 // Font Settings
 
+$fontSmoothing: antialiased;
 $headerFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
 $headerFontWeight: bold !default;
 $headerFontStyle: normal !default;

data/scss/foundation/common/_globals.scss

@@ -2,12 +2,13 @@
 
 /* Global Reset & Standards ---------------------- */
 
-  * { @include box-sizing(border-box); }
+  *, *:before, *:after { @include box-sizing(border-box); }
   html { font-size: 62.5%; }
-  body { background: $white; font-family: $bodyFontFamily; font-weight: $bodyFontWeight; font-style: $bodyFontStyle; font-size: ms(0); line-height: 1; color: $bodyFontColor; position: relative; -webkit-font-smoothing: antialiased; }
+  body { background: $white; font-family: $bodyFontFamily; font-weight: $bodyFontWeight; font-style: $bodyFontStyle; font-size: ms(0); line-height: 1; color: $bodyFontColor; position: relative; -webkit-font-smoothing: $fontSmoothing; }
 
 /* Links ---------------------- */
 
+  a img { border:none; }
   a { color: $mainColor; text-decoration: none; line-height: inherit; }
   a:hover { color: darken($mainColor, 5%); }
   a:focus { color: $mainColor; outline: none; }

data/scss/foundation/components/modules/_clearing.scss

@@ -23,7 +23,7 @@
 
 .block-grid.three-up > li:nth-child(3n+1) { clear: none; }
 
-ul[data-clearing] li { display: block;
+ul[data-clearing] li { cursor: pointer; display: block;
   &.clearing-feature ~ li { display: none; }
 }
 

data/scss/foundation/components/modules/_joyride.scss

@@ -30,4 +30,4 @@
   &:hover { color: #eee !important; }
 }
 
-.joyride-modal-bg { position: fixed; height: 100%; width: 100%; background: $tipScreenFill; z-index: 100; display: none; top: 0; left: 0; cursor: pointer; }
+.joyride-modal-bg { position: fixed; height: 100%; width: 100%; background: transparent; background: $tipScreenFill; z-index: 100; display: none; top: 0; left: 0; cursor: pointer; }

data/scss/foundation/components/modules/_mqueries.scss

@@ -365,7 +365,7 @@
           /* Branding and name */
           &.name { background: darken($topBarBgColor, 20%); height: $topBarHeightMobile;
             h1 { line-height: 1;
-              a { color: $topBarLinkColor; display: block; line-height: $topBarHeightMobile !important; padding-left: $topBarHeightMobile / 2; height: $topBarHeightMobile; }
+              a { color: $topBarLinkColor; display: block; line-height: $topBarHeightMobile !important; padding-left: $topBarHeightMobile / 3; height: $topBarHeightMobile; }
             }
           }
           &:hover, &.active { a { color: $topBarDropLinkColor; } }
@@ -443,7 +443,6 @@
           }
         }
       }
-      &>ul { height: $topBarHeight; }
       section > ul li a:not(.button) { padding-left: $topBarHeightMobile / 2 !important; }
 
       /* When the Small Nav is Showing */
@@ -451,6 +450,9 @@
         ul li.toggle-topbar a { @include cssTriangle($topBarNavToggleSize, rgba(255,255,255,0.5), bottom); top: auto; bottom: 50%; margin-bottom: -($topBarNavToggleSize / 2); }
       }
     }
-    .top-bar ul li.has-button { padding: 0 $topBarHeightMobile / 2 5px; }
+    .top-bar ul li.has-button { padding: 5px $topBarHeightMobile / 3; }
     .top-bar ul li .button.small { margin: 0 !important; display: inline-block; width: 100%; }
+    .top-bar ul > li.has-button {
+      a.button { margin: 0; }
+    }
   }

data/scss/foundation/components/modules/_topbar.scss

@@ -44,8 +44,10 @@
       /* Main Navigation links style */
       &>li { float: left;
         a:not(.button) { color: $topBarLinkColor; display: block; font-size: $topBarLinkSize; font-weight: $topBarLinkWeight; height: $topBarHeight; line-height: $topBarHeight; padding: 0 $topBarHeight / 3; }
-        &:hover, &.active { background: darken($topBarBgColor, 15%);
-          a { color: darken($topBarLinkColor, 15%); }
+        &:not(.name) {
+          &:hover, &.active { background: darken($topBarBgColor, 15%);
+            a { color: darken($topBarLinkColor, 15%); }
+          }
         }
 
         /* Dividers between navigation */

data/scss/foundation/components/modules/_ui.scss

@@ -101,7 +101,7 @@
 
     &>li {  list-style: none; margin: 0; padding: 0; border-top: 1px solid $secondaryColor;
 
-      .title { cursor: pointer; background: lighten($secondaryColor, 5%); padding: 15px; margin: 0; position: relative;  border-#{$defaultFloat}: 1px solid $secondaryColor; border-#{$defaultOpposite}: 1px solid $secondaryColor; @include single-transition(0.15s, background, linear);
+      & > div.title { cursor: pointer; background: lighten($secondaryColor, 5%); padding: 15px; margin: 0; position: relative;  border-#{$defaultFloat}: 1px solid $secondaryColor; border-#{$defaultOpposite}: 1px solid $secondaryColor; @include single-transition(0.15s, background, linear);
 
         h1, h2, h3, h4, h5 { margin: 0; }
         &:after { @include cssTriangle(6px, darken($secondaryColor, 30%), $defaultOpposite); position: absolute; #{$defaultOpposite}: 15px; top: 21px; }
@@ -187,9 +187,9 @@
   /* Inline Link List */
   ul.inline-list, ul.link-list { margin: 0 0 $linkListBottomMargin; padding: 0; list-style: none; overflow: hidden;
 
-    li { list-style: none; float: $defaultFloat; margin-#{$defaultFloat}: 22px; display: block;
+    & > li { list-style: none; float: $defaultFloat; margin-#{$defaultFloat}: 22px; display: block;
 
-      a { display: block; }
+      & > * { display: block; }
     }
   }
 

data/scss/foundation/mixins/_clearfix.scss

@@ -1,12 +1,12 @@
 // The micro clearfix http://nicolasgallagher.com/micro-clearfix-hack/
 
   @mixin clearfix() { *zoom:1;
-    &:before, &:after { content: ""; display: table; }
+    &:before, &:after { content: " "; display: table; }
     &:after { clear: both; }
   }
   
   @mixin mobileClearfix() {
-    @include respondTo(smallScreen) { &:before, &:after { content: ""; display: table; }
+    @include respondTo(smallScreen) { &:before, &:after { content: " "; display: table; }
       &:after { clear: both; }
       &:last-child { float: none; }
     }

data/scss/foundation/mixins/_semantic-grid.scss

@@ -2,11 +2,13 @@
 
   // Outer row mixin for container rows
 
-  @mixin outerRow() { width: $rowWidth; max-width: 100%; min-width: $screenSmall; margin: 0 auto; @extend %clearfix; }
+  @mixin outerRow() {
+    width: $rowWidth; max-width: 100%; min-width: $screenSmall; margin: 0 auto; @extend %clearfix;
+    @include respondTo(smallScreen) { width: auto; min-width: 0; margin-left: 0; margin-right: 0; }
+  }
 
   // Inner row mixin for nested rows, must be a child of an outer-row element. $behavior can be 'collapse' to get rid of margins
 
-  @mixin innerRowBase { width: auto; max-width: none; min-width: 0; }
   @mixin innerRow($behavior: false) {
       @if $behavior == collapse { @extend %row-i-base; margin: 0; @extend %clearfix;
     } @else                     { @extend %row-i-base; margin: 0 (-($columnGutter/2)); @extend %clearfix; }
@@ -14,11 +16,10 @@
 
   // Columns mixin, syntax is ($columns, $behavior). Behavior can be 'centered' which centers things or 'collapse' which collapses the gutters. ex @include row(4,[center | collapse])
 
-  @mixin columnBase { position: relative; min-height: 1px; padding: 0 ($columnGutter/2); }
   @mixin column($columns:$columns, $behavior: false) {
-      @if      $behavior == center   { @extend %fl-n; margin: 0 auto !important; @extend %c-base; width: gridCalc($columns, $totalColumns);
-    } @else if $behavior == collapse { @extend %fl-l; @extend %c-base; padding: 0; width: gridCalc($columns, $totalColumns);
-    } @else                          { @extend %fl-l; @extend %c-base; width: gridCalc($columns, $totalColumns); }
+      @if      $behavior == center   { @extend %fl-n; margin: 0 auto !important; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; }
+    } @else if $behavior == collapse { @extend %fl-l; @extend %c-base; padding: 0; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; }
+    } @else                          { @extend %fl-l; @extend %c-base; width: gridCalc($columns, $totalColumns); @include respondTo(smallScreen) { float: left; width: 100%; } }
   }
 
   // Offset Mixin, include after a column mixin to manipulate its grid offset.
@@ -30,8 +31,7 @@
   @mixin push($push:1) { left: gridCalc($push, $totalColumns); }
   @mixin pull($push:1) { right: gridCalc($push, $totalColumns); }
 
-  // Mobile Row, synctax is @include mobile-row();
-
+  // Mobile Row, synctax is @include mobile-row(); (This mixin isn't really necessary, will be deprecated in 4)
   @mixin mobileRow() { @include respondTo(smallScreen) { width: auto; min-width: 0; margin-left: 0; margin-right: 0; @include clearfix(); } }
 
   // Mobile Columns, syntax is @include mobile-column(#);
@@ -56,10 +56,10 @@
   %clearfix-m { @include mobileClearfix(); }
 
   %row-o { @include outerRow(); }
-  %row-i-base { @include innerRowBase(); }
+  %row-i-base { width: auto; max-width: none; min-width: 0; }
   %row-i { @include innerRow(); }
 
-  %c-base { @include columnBase(); }
+  %c-base { position: relative; min-height: 1px; padding: 0 ($columnGutter/2); }
 
   @for $i from 1 through $totalColumns {
     %c-#{$i} { @include column($i); }

data/templates/project/index.html

@@ -8,7 +8,7 @@
 	<meta charset="utf-8" />
 
 	<!-- Set the viewport width to device width for mobile -->
-	<meta name="viewport" content="width=device-width" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 	<title>Welcome to Foundation</title>
 

data/templates/project/scss/_settings.scss

@@ -25,6 +25,7 @@
 
 // Font Settings
 
+// $fontSmoothing: antialiased;
 // $headerFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
 // $headerFontWeight: bold;
 // $headerFontStyle: normal;

data/templates/project/scss/app.scss

@@ -45,3 +45,6 @@
 // @import "foundation/components/modules/orbit";
 // @import "foundation/components/modules/reveal";
 // @import "foundation/components/modules/offcanvas";
+
+// Media Queries Overrides
+// @import "foundation/components/modules/mqueries";

data/test/clearing.html

@@ -56,6 +56,8 @@
 
   <!-- Included JS Files -->
   <script src="../vendor/assets/javascripts/foundation/jquery.js"></script>
+  <script src="../vendor/assets/javascripts/foundation/jquery.event.move.js"></script>
+  <script src="../vendor/assets/javascripts/foundation/jquery.event.swipe.js"></script>
   <script src="../vendor/assets/javascripts/foundation/jquery.foundation.mediaQueryToggle.js"></script>
   <script src="../vendor/assets/javascripts/foundation/jquery.placeholder.js"></script>
   <script src="../vendor/assets/javascripts/foundation/jquery.foundation.alerts.js"></script>

data/test/elements.html

@@ -183,11 +183,11 @@
         <div class="four columns">
           <a name="accordion"></a>
           <h4>Accordion</h4>
-          <p>Accordions are similar to tabs as a way to selectively show a single panel of content at a time.</p>
+          <p>Accordions are similar to tabs as a way to selectively show a single panel of content at a time. You can add a <code>.hover</code> class to the accordion <code>ul</code> to make it open on hover.</p>
         </div>
         <br>
         <div class="eight columns">
-          <ul class="accordion hover">
+          <ul class="accordion">
             <li class="active">
               <div class="title">
                 <h5>Accordion Panel 1</h5>

data/test/forms.html

@@ -51,11 +51,11 @@
         <br>
         <div class="eight columns">
           <form>
-            <label>This is a label.</label>
-            <input type="text" placeholder="Standard Input" />
+            <label for="standard_input">This is a label.</label>
+            <input type="text" placeholder="Standard Input" id="standard_input" />
 
-            <label>Address</label>
-            <input type="text" class="twelve" placeholder="Street" />
+            <label for="address_1">Address</label>
+            <input type="text" class="twelve" placeholder="Street" id="address_1" />
             <div class="row">
               <div class="six columns">
                 <input type="text" placeholder="City" />
@@ -76,26 +76,26 @@
           <form>
             <div class="row">
               <div class="two mobile-one columns">
-                <label class="right inline">Address Name:</label>
+                <label class="right inline" for="address_name">Address Name:</label>
               </div>
               <div class="ten mobile-three columns">
-                <input type="text" placeholder="e.g. Home" class="eight" />
+                <input type="text" placeholder="e.g. Home" class="eight" id="address_name" />
               </div>
             </div>
             <div class="row">
               <div class="two mobile-one columns">
-                <label class="right inline">City:</label>
+                <label class="right inline" for="city">City:</label>
               </div>
               <div class="ten mobile-three columns">
-                <input type="text" class="eight" />
+                <input type="text" class="eight" id="city" />
               </div>
             </div>
             <div class="row">
               <div class="two mobile-one columns">
-                <label class="right inline">ZIP:</label>
+                <label class="right inline" for="zip">ZIP:</label>
               </div>
               <div class="ten mobile-three columns">
-                <input type="text" class="three" />
+                <input type="text" class="three" id="zip" />
               </div>
             </div>
           </form>
@@ -116,11 +116,11 @@
 
               <legend>Fieldset Name</legend>
 
-              <label>This is a label.</label>
-              <input type="text" placeholder="Standard Input" />
+              <label for="standard_input_2">This is a label.</label>
+              <input type="text" placeholder="Standard Input" id="standard_input_2"/>
 
-              <label>Address</label>
-              <input type="text" />
+              <label for="address_2">Address</label>
+              <input type="text" id="address_2" />
               <input type="text" class="six" />
 
             </fieldset>
@@ -138,7 +138,7 @@
         </div>
         <br>
         <div class="eight columns">
-          <label>Input with a prefix character</label>
+          <label for="input_prefix">Input with a prefix character</label>
           <div class="row">
             <div class="eight columns">
               <div class="row collapse">
@@ -146,17 +146,17 @@
                   <span class="prefix">#</span>
                 </div>
                 <div class="ten mobile-three columns">
-                  <input type="text" />
+                  <input type="text" id="input_prefix" />
                 </div>
               </div>
             </div>
           </div>
-          <label>Input with a postfix label</label>
+          <label for="input_postfix">Input with a postfix label</label>
           <div class="row">
             <div class="eight columns">
               <div class="row collapse">
                 <div class="nine mobile-three columns">
-                  <input type="text" />
+                  <input type="text" id="input_postfix" />
                 </div>
                 <div class="three mobile-one columns">
                   <span class="postfix">.com</span>
@@ -164,12 +164,12 @@
               </div>
             </div>
           </div>
-          <label>Input with a postfix action (button)</label>
+          <label for="input_postfix_button">Input with a postfix action (button)</label>
           <div class="row">
             <div class="eight columns">
               <div class="row collapse">
                 <div class="eight mobile-three columns">
-                  <input type="text" />
+                  <input type="text" id="input_postfix_button" />
                 </div>
                 <div class="four mobile-one columns">
                   <a class="button expand postfix">Search</a>
@@ -192,14 +192,14 @@
         <div class="eight columns">
           <div class="row">
             <div class="six columns">
-              <label class="error">Field with Error</label>
-              <input type="text" class="error" />
+              <label class="error" for="error">Field with Error</label>
+              <input type="text" class="error" id="error" />
               <small class="error">Invalid entry</small>
             </div>
 
             <div class="six columns end error">
-              <label>Another Error</label>
-              <input type="text" />
+              <label for="error_2">Another Error</label>
+              <input type="text" id="error_2" />
               <small>Invalid entry</small>
             </div>
           </div>
@@ -219,26 +219,26 @@
               <div class="row">
                 <div class="five columns">
 
-                  <label>Name</label>
-                  <input type="text" />
+                  <label for="name">Name</label>
+                  <input type="text" id="name" />
 
-                  <label>Occupation</label>
-                  <input type="text" />
+                  <label for="occupation">Occupation</label>
+                  <input type="text" id="occupation" />
 
-                  <label>Twitter</label>
+                  <label for="twitter">Twitter</label>
                   <div class="row collapse">
                     <div class="two mobile-one columns">
                       <span class="prefix">@</span>
                     </div>
                     <div class="ten mobile-three columns">
-                      <input type="text" placeholder="foundationzurb" />
+                      <input type="text" placeholder="foundationzurb" id="twitter" />
                     </div>
                   </div>
 
-                  <label>URL</label>
+                  <label for="url">URL</label>
                   <div class="row collapse">
                     <div class="nine mobile-three columns">
-                      <input type="text" placeholder="foundation.zurb" />
+                      <input type="text" placeholder="foundation.zurb" id="url"/>
                     </div>
                     <div class="three mobile-one columns">
                       <span class="postfix">.com</span>
@@ -249,27 +249,27 @@
 
                 <div class="five columns">
 
-                  <label class="error">Field with Error</label>
-                  <input type="text" class="error" />
+                  <label class="error" for="error_3">Field with Error</label>
+                  <input type="text" class="error" id="error_3" />
                   <small class="error">Invalid entry</small>
 
                   <div class="error">
-                    <label>Another Error</label>
-                    <input type="text" />
+                    <label for="error_4">Another Error</label>
+                    <input type="text" id="error_4" />
                     <small>Invalid entry</small>
                   </div>
 
                 </div>
               </div>
 
-              <label>Address</label>
-              <input type="text" placeholder="Street (e.g. 123 Awesome St.)" />
+              <label for="address_3">Address</label>
+              <input type="text" placeholder="Street (e.g. 123 Awesome St.)" id="address_3" />
 
               <div class="row">
                 <div class="six columns">
                   <input type="text" placeholder="City" />
                 </div>
-                <div class="two columns" />
+                <div class="two columns">
                   <select>
                     <option>CA</option>
                   </select>

data/test/reveal.html

@@ -33,7 +33,7 @@
 			<h4 class="subheader">Modal dialogs, or pop-up windows, are handy for prototyping and production. Foundation includes Reveal our jQuery modal plugin, to make this easy for you.</h4>
 
 			<p>
-        <a href="#" data-reveal-id="exampleModal" class="radius button">
+        <a href="#" class="radius button">
           Example Modal&hellip;
         </a>
       </p>
@@ -85,7 +85,7 @@
   <script src="../vendor/assets/javascripts/foundation/jquery.foundation.orbit.js"></script>
 	<script src="../vendor/assets/javascripts/foundation/app.js"></script>
   <script type="text/javascript">
-    // Page-Specific JavaScript Goes Here
+  // Page-Specific JavaScript Goes Here
   </script>
 </body>
 </html>

data/test/scss/_settings.scss

@@ -25,6 +25,7 @@
 
 // Font Settings
 
+// $fontSmoothing: antialiased;
 // $headerFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
 // $headerFontWeight: bold;
 // $headerFontStyle: normal;

data/test/scss/styles.scss

@@ -46,4 +46,5 @@
 // @import "foundation/components/modules/reveal";
 // @import "foundation/components/modules/offcanvas";
 
-body { font-size: ms(-3); }
+// Media Queries Overrides
+// @import "foundation/components/modules/mqueries";

data/vendor/assets/javascripts/foundation/app.js

@@ -17,7 +17,7 @@
     $.fn.foundationMagellan         ? $doc.foundationMagellan() : null;
     $.fn.foundationClearing         ? $doc.foundationClearing() : null;
 
-    $('input, textarea').placeholder();
+    $.fn.placeholder                ? $('input, textarea').placeholder() : null;
   });
 
   // UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE8 SUPPORT AND ARE USING .block-grids

data/vendor/assets/javascripts/foundation/jquery.foundation.accordion.js

@@ -19,13 +19,18 @@
       });
     } else {
       $('.accordion li', this).on('click.fndtn', function () {
-        var p = $(this).parent(),
+        var li = $(this),
+            p = $(this).parent(),
             flyout = $(this).children('.content').first();
 
-        $('.content', p).not(flyout).hide().parent('li').removeClass('active'); //changed this
-        flyout.show(0, function () {
-          flyout.parent('li').addClass('active');
-        });
+        if (li.hasClass('active')) {
+          p.find('li').removeClass('active').end().find('.content').hide();
+        } else {
+          $('.content', p).not(flyout).hide().parent('li').removeClass('active'); //changed this
+          flyout.show(0, function () {
+            flyout.parent('li').addClass('active');
+          });
+        }
       });
     }
 

data/vendor/assets/javascripts/foundation/jquery.foundation.buttons.js

@@ -30,7 +30,11 @@
       var $el = $(this),
         button = $el.closest('.button.dropdown'),
         dropdown = $('> ul', button);
-      e.preventDefault();
+
+        // If the click is registered on an actual link then do not preventDefault which stops the browser from following the link
+        if (e.target.nodeName !== "A"){
+          e.preventDefault();
+        }
 
       // close other dropdowns
       closeDropdowns(config.dropdownAsToggle ? dropdown : '');
@@ -44,6 +48,7 @@
 
     // close all dropdowns and deactivate all buttons
     $doc.on('click.fndtn', 'body, html', function (e) {
+      if (undefined == e.originalEvent) { return; }
       // check original target instead of stopping event propagation to play nice with other events
       if (!$(e.originalEvent.target).is('.button.dropdown:not(.split), .button.dropdown.split span')) {
         closeDropdowns();

data/vendor/assets/javascripts/foundation/jquery.foundation.clearing.js

@@ -18,6 +18,7 @@
             '<p class="clearing-caption"></p><a href="#" class="clearing-main-left"></a>' +
             '<a href="#" class="clearing-main-right"></a></div>'
         },
+        initialized : false,
         locked : false
       },
 
@@ -43,7 +44,7 @@
               // if the gallery hasn't been built yet...build it
               methods.assemble($el.find('li'));
 
-              methods.events();
+              if (!defaults.initialized) methods.events();
 
             }
           });
@@ -54,10 +55,15 @@
 
           doc.on('click.fndtn.clearing', 'ul[data-clearing] li', function (e, current, target) {
             var current = current || $(this),
-                target = target || current;
+                target = target || current,
+                settings = current.parent().data('fndtn.clearing.settings');
 
             e.preventDefault();
 
+            if (!settings) {
+              current.parent().foundationClearing();
+            }
+
             // set current and target to the clicked li if not otherwise defined.
             methods.open($(e.target), current, target);
             methods.update_paddles(target);
@@ -85,7 +91,7 @@
             methods.go(clearing, 'prev');
           });
 
-          doc.on('click.fndtn.clearing', 'a.clearing-close, div.clearing-blackout', function (e) {
+          doc.on('click.fndtn.clearing', 'a.clearing-close, div.clearing-blackout, div.visible-img', function (e) {
             var root = (function (target) {
               if (/blackout/.test(target.selector)) {
                 return target;
@@ -122,6 +128,10 @@
             if (e.which === 37) {
               methods.go(clearing, 'prev');
             }
+
+            if (e.which === 27) {
+              $('a.clearing-close').trigger('click');
+            }
           });
 
           doc.on('movestart', function(e) {
@@ -144,9 +154,11 @@
             var clearing = $('.clearing-blackout').find('ul[data-clearing]');
             methods.go(clearing, 'prev');
           });
+
+          defaults.initialized = true;
         },
 
-        assemble : function ($li, target) {
+        assemble : function ($li) {
           var $el = $li.parent(),
               settings = $el.data('fndtn.clearing.settings'),
               grid = $el.detach(),

data/vendor/assets/javascripts/foundation/jquery.foundation.forms.js

@@ -376,11 +376,11 @@
 
   var toggleRadio = function($element) {
     var $input = $element.prev(),
+        $form = $input.closest('form.custom'),
         input = $input[0];
 
     if (false === $input.is(':disabled')) {
-
-      $('input:radio[name="' + $input.attr('name') + '"]').next().not($element).removeClass('checked');
+      $form.find('input:radio[name="' + $input.attr('name') + '"]').next().not($element).removeClass('checked');
       if ( !$element.hasClass('checked') ) {
         $element.toggleClass('checked');
       }

data/vendor/assets/javascripts/foundation/jquery.foundation.joyride.js

@@ -1,5 +1,5 @@
 /*
- * jQuery Foundation Joyride Plugin 2.0.1
+ * jQuery Foundation Joyride Plugin 2.0.2
  * http://foundation.zurb.com
  * Copyright 2012, ZURB
  * Free to use under the MIT license.
@@ -56,7 +56,7 @@
             settings.$window = $(window);
             settings.$content_el = $(this);
             settings.body_offset = $(settings.tipContainer).position();
-            settings.$tip_content = $('li', settings.$content_el);
+            settings.$tip_content = $('> li', settings.$content_el);
             settings.paused = false;
             settings.attempts = 0;
 
@@ -109,12 +109,12 @@
 
             });
 
-            $('.joyride-close-tip').on('click.joyride', function (e) {
+            settings.$document.on('click.joyride', '.joyride-close-tip', function (e) {
               e.preventDefault();
               methods.end();
             });
 
-            settings.$window.on('resize.joyride', function (e) {
+            settings.$window.bind('resize.joyride', function (e) {
               if (methods.is_phone()) {
                 methods.pos_phone();
               } else {
@@ -537,8 +537,8 @@
 
       corners : function (el) {
         var w = settings.$window,
-            right = w.outerWidth() + w.scrollLeft(),
-            bottom = w.outerWidth() + w.scrollTop();
+            right = w.width() + w.scrollLeft(),
+            bottom = w.width() + w.scrollTop();
 
         return [
           el.offset().top <= w.scrollTop(),
@@ -597,13 +597,13 @@
         // define on() and off() for older jQuery
         if (!$.isFunction($.fn.on)) {
 
-          $.fn.on = function(types, sel, fn) {
+          $.fn.on = function (types, sel, fn) {
 
             return this.delegate(sel, types, fn);
 
           };
 
-          $.fn.off = function(types, sel, fn) {
+          $.fn.off = function (types, sel, fn) {
 
             return this.undelegate(sel, types, fn);
 

data/vendor/assets/javascripts/foundation/jquery.foundation.magellan.js

@@ -12,8 +12,9 @@
   'use strict';
 
   $.fn.foundationMagellan = function(options) {
-    var defaults = {
-      threshold: 25,
+    var $fixedMagellan = $('[data-magellan-expedition=fixed]'),
+    	defaults = {
+      threshold: ($fixedMagellan.length) ? $fixedMagellan.outerHeight(true) : 25,
       activeClass: 'active'
     },
 
@@ -37,21 +38,21 @@
       .addClass($expedition.attr('data-magellan-active-class') || options.activeClass);
 
     // Update fixed position
-    $('[data-magellan-expedition=fixed]').on('magellan.update-position', function(){
+    $fixedMagellan.on('magellan.update-position', function(){
       var $el = $(this);
       $el.data("magellan-fixed-position","");
       $el.data("magellan-top-offset", "");
     });
 
-    $('[data-magellan-expedition=fixed]').trigger('magellan.update-position');
+    $fixedMagellan.trigger('magellan.update-position');
 
     $(window).on('resize.magellan', function() {
-      $('[data-magellan-expedition=fixed]').trigger('magellan.update-position');
+      $fixedMagellan.trigger('magellan.update-position');
     });
     
     $(window).on('scroll.magellan', function() {
       var windowScrollTop = $(window).scrollTop();
-      $('[data-magellan-expedition=fixed]').each(function() {
+      $fixedMagellan.each(function() {
         var $expedition = $(this);
         if ($expedition.data("magellan-top-offset") === "") {
           $expedition.data("magellan-top-offset", $expedition.offset().top);

data/vendor/assets/javascripts/foundation/jquery.foundation.tabs.js

@@ -1,43 +1,56 @@
-;(function ($, window, undefined) {
+;(function ($, window, document, undefined) {
   'use strict';
 
-  $.fn.foundationTabs = function (options) {
-
-    var settings = $.extend({
-      callback: $.noop
-    }, options);
-
-    var activateTab = function ($tab) {
-      var $activeTab = $tab.closest('dl, ul').find('.active'),
-          target = $tab.children('a').attr("href"),
-          hasHash = /^#/.test(target),
-          contentLocation = '';
-
-      if (hasHash) {
-        contentLocation = target + 'Tab';
-
-        // Strip off the current url that IE adds
-        contentLocation = contentLocation.replace(/^.+#/, '#');
-
-        //Show Tab Content
-        $(contentLocation).closest('.tabs-content').children('li').removeClass('active').hide();
-        $(contentLocation).css('display', 'block').addClass('active');
+  var settings = {
+        callback: $.noop,
+        init: false
+      }, 
+
+      methods = {
+        init : function (options) {
+          settings = $.extend({}, options, settings);
+
+          return this.each(function () {
+            if (!settings.init) methods.events();
+          });
+        },
+
+        events : function () {
+          $(document).on('click.fndtn', '.tabs a', function (e) {
+            methods.set_tab($(this).parent('dd, li'), e);
+          });
+          
+          settings.init = true;
+        },
+
+        set_tab : function ($tab, e) {
+          var $activeTab = $tab.closest('dl, ul').find('.active'),
+              target = $tab.children('a').attr("href"),
+              hasHash = /^#/.test(target),
+              $content = $(target + 'Tab');
+
+          if (hasHash && $content.length > 0) {
+            // Show tab content
+            e.preventDefault();
+            $content.closest('.tabs-content').children('li').removeClass('active').hide();
+            $content.css('display', 'block').addClass('active');
+          }
+
+          // Make active tab
+          $activeTab.removeClass('active');
+          $tab.addClass('active');
+
+          settings.callback();
+        }
       }
 
-      //Make Tab Active
-      $activeTab.removeClass('active');
-      $tab.addClass('active');
-    };
-
-    $(document).on('click.fndtn', '.tabs a', function (event){
-      activateTab($(this).parent('dd, li'));
-    });
-
-    if (window.location.hash) {
-      activateTab($('a[href="' + window.location.hash + '"]').parent('dd, li'));
-      settings.callback();
+  $.fn.foundationTabs = function (method) {
+    if (methods[method]) {
+      return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+    } else if (typeof method === 'object' || !method) {
+      return methods.init.apply(this, arguments);
+    } else {
+      $.error('Method ' +  method + ' does not exist on jQuery.foundationTooltips');
     }
-
   };
-
-})(jQuery, this);
+}(jQuery, this, this.document));

data/vendor/assets/javascripts/foundation/jquery.foundation.topbar.js

@@ -1,5 +1,5 @@
 /*
- * jQuery Foundation Top Bar 2.0.1
+ * jQuery Foundation Top Bar 2.0.2
  * http://foundation.zurb.com
  * Copyright 2012, ZURB
  * Free to use under the MIT license.
@@ -20,7 +20,8 @@
         return this.each(function () {
           settings = $.extend(settings, options);
           settings.$w = $(window),
-          settings.$topbar = $('nav.top-bar');
+          settings.$topbar = $('nav.top-bar'),
+          settings.$section = settings.$topbar.find('section'),
           settings.$titlebar = settings.$topbar.children('ul:first');
           var breakpoint = $("<div class='top-bar-js-breakpoint'/>").appendTo("body");
           settings.breakPoint = breakpoint.width();
@@ -46,6 +47,13 @@
               settings.$topbar.toggleClass('expanded');
               settings.$topbar.css('min-height', '');
             }
+
+            if (!settings.$topbar.hasClass('expanded')) {
+              settings.$section.css({left: '0%'});
+              settings.$section.find('>.name').css({left: '100%'});
+              settings.$section.find('li.moved').removeClass('moved');
+              settings.index = 0;
+            }
           });
 
           // Show the Dropdown Levels on Click
@@ -57,14 +65,13 @@
               var $this = $(this),
                   $selectedLi = $this.closest('li'),
                   $nextLevelUl = $selectedLi.children('ul'),
-                  $section = $this.closest('section'),
                   $nextLevelUlHeight = 0,
                   $largestUl;
 
               settings.index += 1;
               $selectedLi.addClass('moved');
-              $section.css({'left': -(100 * settings.index) + '%'});
-              $section.find('>.name').css({'left': 100 * settings.index + '%'});
+              settings.$section.css({left: -(100 * settings.index) + '%'});
+              settings.$section.find('>.name').css({left: 100 * settings.index + '%'});
 
               $this.siblings('ul').height(settings.height + settings.$titlebar.outerHeight(true));
               settings.$topbar.css('min-height', settings.height + settings.$titlebar.outerHeight(true) * 2)
@@ -83,12 +90,11 @@
 
             var $this = $(this),
               $movedLi = $this.closest('li.moved'),
-              $section = $this.closest('section'),
               $previousLevelUl = $movedLi.parent();
 
             settings.index -= 1;
-            $section.css({'left': -(100 * settings.index) + '%'});
-            $section.find('>.name').css({'left': 100 * settings.index + '%'});
+            settings.$section.css({left: -(100 * settings.index) + '%'});
+            settings.$section.find('>.name').css({'left': 100 * settings.index + '%'});
 
             if (settings.index === 0) {
               settings.$topbar.css('min-height', 0);
@@ -104,12 +110,10 @@
         return settings.$w.width() < settings.breakPoint;
       },
       assemble : function () {
-        var $section = settings.$topbar.children('section');
-
         // Pull element out of the DOM for manipulation
-        $section.detach();
+        settings.$section.detach();
 
-        $section.find('.has-dropdown>a').each(function () {
+        settings.$section.find('.has-dropdown>a').each(function () {
           var $link = $(this),
               $dropdown = $link.siblings('.dropdown'),
               $titleLi = $('<li class="title back js-generated"><h5><a href="#"></a></h5></li>');
@@ -120,7 +124,7 @@
         });
 
         // Put element back in the DOM
-        $section.appendTo(settings.$topbar);
+        settings.$section.appendTo(settings.$topbar);
       },
       largestUL : function () {
         var uls = settings.$topbar.find('section ul ul'),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zurb-foundation
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3236275237627838417
+      hash: 1729638945161195289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3236275237627838417
+      hash: 1729638945161195289
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23