zurb-foundation 2.2.0.2 → 2.2.1.0

data/foundation.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
-  s.add_runtime_dependency "rails", "~> 3.1"
+  s.add_runtime_dependency "railties", ">= 3.1.0", "< 4.0"
   s.add_runtime_dependency "jquery-rails", ">= 1.0"
 end

data/lib/foundation/version.rb

@@ -1,4 +1,4 @@
 module Foundation
-  COMMIT = "add28ff4b81fa1f2e2ed116fd46e44b8aa17acb7"
-  VERSION = "2.2.0.2"
+  COMMIT = "e9d5d8f5267b5d2db23cb74fb307fe149913ca14"
+  VERSION = "2.2.1.0"
 end

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

@@ -8,12 +8,15 @@ jQuery(document).ready(function ($) {
 	function activateTab($tab) {
 		var $activeTab = $tab.closest('dl').find('a.active'),
 				contentLocation = $tab.attr("href") + 'Tab';
+				
+		// Strip off the current url that IE adds
+		contentLocation = contentLocation.replace(/^.+#/, '#');
 
 		//Make Tab Active
 		$activeTab.removeClass('active');
 		$tab.addClass('active');
 
-    	//Show Tab Content
+    //Show Tab Content
 		$(contentLocation).closest('.tabs-content').children('li').hide();
 		$(contentLocation).css('display', 'block');
 	}
@@ -28,6 +31,7 @@ jQuery(document).ready(function ($) {
 
 	if (window.location.hash) {
 		activateTab($('a[href="' + window.location.hash + '"]'));
+		$.foundation.customForms.appendCustomMarkup();
 	}
 
 	/* ALERT BOXES ------------ */
@@ -90,7 +94,6 @@ jQuery(document).ready(function ($) {
 	/* DISABLED BUTTONS ------------- */
 	/* Gives elements with a class of 'disabled' a return: false; */
   
-
 });
 
 

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

@@ -6,6 +6,9 @@
  * http://www.opensource.org/licenses/mit-license.php
 */
 
+jQuery.foundation = jQuery.foundation || {};
+jQuery.foundation.customForms = jQuery.foundation.customForms || {};
+
 jQuery(document).ready(function ($) {
   
   function appendCustomMarkup(type) {
@@ -22,8 +25,6 @@ jQuery(document).ready(function ($) {
       $span.toggleClass('disabled', $this.is(':disabled'));
     });
   }
-  appendCustomMarkup('checkbox');
-  appendCustomMarkup('radio');
 
   function appendCustomSelect(sel) {
     var $this = $(sel),
@@ -32,6 +33,7 @@ jQuery(document).ready(function ($) {
         maxWidth = 0,
         $li;
 
+    if ($this.hasClass('no-custom')) { return; }
     if ($customSelect.length === 0) {
       $customSelectSize = '';
       if ($(sel).hasClass('small')) {
@@ -71,6 +73,9 @@ jQuery(document).ready(function ($) {
       }
     });
 
+    $customSelect.css('width', 'inherit');
+    $customSelect.find('ul').css('width', 'inherit');
+
     $customSelect.find('li').each(function () {
       $customSelect.addClass('open');
       if ($(this).outerWidth() > maxWidth) {
@@ -85,11 +90,17 @@ jQuery(document).ready(function ($) {
     }
 
   }
-
-  $('form.custom select').each(function () {
-    appendCustomSelect(this);
-  });
   
+  $.foundation.customForms.appendCustomMarkup = function () {
+    appendCustomMarkup('checkbox');
+    appendCustomMarkup('radio');
+  
+    $('form.custom select').each(function () {
+      appendCustomSelect(this);
+    });
+  };
+
+  $.foundation.customForms.appendCustomMarkup();
 });
 
 (function ($) {
@@ -144,13 +155,15 @@ jQuery(document).ready(function ($) {
     var $input = $element.prev(),
         input = $input[0];
 
-    $('input:radio[name="' + $input.attr('name') + '"]').each(function () {
-      $(this).next().removeClass('checked');
-    });
-    input.checked = ((input.checked) ? false : true);
-    $element.toggleClass('checked');
+    if (false == $input.is(':disabled')) {
+      $('input:radio[name="' + $input.attr('name') + '"]').each(function () {
+        $(this).next().removeClass('checked');
+      });
+      input.checked = ((input.checked) ? false : true);
+      $element.toggleClass('checked');
     
-    $input.trigger('change');
+      $input.trigger('change');
+    }
   }
   
   $('form.custom span.custom.checkbox').live('click', function (event) {

data/vendor/assets/javascripts/foundation/jquery.orbit-1.4.0.js

@@ -8,21 +8,21 @@
 
 
 (function($) {
-  
+
   $.fn.findFirstImage = function () {
 	  return this.first()
 	          .find('img')
             .andSelf().filter('img')
             .first();
 	};
-  
+
   var ORBIT = {
-    
-    defaults: {  
+
+    defaults: {
       animation: 'horizontal-push', 		// fade, horizontal-slide, vertical-slide, horizontal-push, vertical-push
       animationSpeed: 600, 				// how fast animtions are
       timer: true, 						// true or false to have the timer
-      advanceSpeed: 4000, 				// if timer is enabled, time between transitions 
+      advanceSpeed: 4000, 				// if timer is enabled, time between transitions
       pauseOnHover: false, 				// if you hover pauses the slider
       startClockOnMouseOut: false, 		// if clock should start on MouseOut
       startClockOnMouseOutAfter: 1000, 	// how long after MouseOut should the timer start again
@@ -32,14 +32,16 @@
       captions: true, 					// do you want captions?
       captionAnimation: 'fade', 			// fade, slideOpen, none
       captionAnimationSpeed: 600, 		// if so how quickly should they animate in
+      resetTimerOnClick: false,      // true resets the timer instead of pausing slideshow progress on manual navigation
       bullets: false,						// true or false to activate the bullet navigation
       bulletThumbs: false,				// thumbnails for the bullets
       bulletThumbLocation: '',			// location from this file where thumbs will be
-      afterSlideChange: $.noop,		// empty function 
+      afterSlideChange: $.noop,		// empty function
+      afterLoadComplete: $.noop, //callback to execute after everything has been loaded
       fluid: true,
       centerBullets: true    // center bullet nav with js, turn this off if you want to position the bullet nav manually
  	  },
- 	  
+
  	  activeSlide: 0,
     numberSlides: 0,
     orbitWidth: null,
@@ -52,12 +54,12 @@
     captionHTML: '<div class="orbit-caption"></div>',
     directionalNavHTML: '<div class="slider-nav"><span class="right"></span><span class="left"></span></div>',
     bulletHTML: '<ul class="orbit-bullets"></ul>',
-    
+
     init: function (element, options) {
       var $imageSlides,
           imagesLoadedCount = 0,
           self = this;
-      
+
       // Bind functions to correct context
       this.clickTimer = $.proxy(this.clickTimer, this);
       this.addBullet = $.proxy(this.addBullet, this);
@@ -66,38 +68,38 @@
       this.startTimerAfterMouseLeave = $.proxy(this.startTimerAfterMouseLeave, this);
       this.clearClockMouseLeaveTimer = $.proxy(this.clearClockMouseLeaveTimer, this);
       this.rotateTimer = $.proxy(this.rotateTimer, this);
-      
+
       this.options = $.extend({}, this.defaults, options);
       if (this.options.timer === 'false') this.options.timer = false;
       if (this.options.captions === 'false') this.options.captions = false;
       if (this.options.directionalNav === 'false') this.options.directionalNav = false;
-      
+
       this.$element = $(element);
       this.$wrapper = this.$element.wrap(this.wrapperHTML).parent();
       this.$slides = this.$element.children('img, a, div');
-      
+
       this.$element.bind('orbit.next', function () {
         self.shift('next');
       });
-      
+
       this.$element.bind('orbit.prev', function () {
         self.shift('prev');
       });
-      
+
       this.$element.bind('orbit.goto', function (event, index) {
         self.shift(index);
       });
-      
+
       this.$element.bind('orbit.start', function (event, index) {
         self.startClock();
       });
-      
+
       this.$element.bind('orbit.stop', function (event, index) {
         self.stopClock();
       });
-      
+
       $imageSlides = this.$slides.filter('img');
-      
+
       if ($imageSlides.length === 0) {
         this.loaded();
       } else {
@@ -109,53 +111,55 @@
         });
       }
     },
-    
+
     loaded: function () {
       this.$element
         .addClass('orbit')
         .css({width: '1px', height: '1px'});
-        
+
       this.$slides.addClass('orbit-slide');
-        
+
       this.setDimentionsFromLargestSlide();
       this.updateOptionsIfOnlyOneSlide();
       this.setupFirstSlide();
-      
+
       if (this.options.timer) {
         this.setupTimer();
         this.startClock();
       }
-      
+
       if (this.options.captions) {
         this.setupCaptions();
       }
-      
+
       if (this.options.directionalNav) {
         this.setupDirectionalNav();
       }
-      
+
       if (this.options.bullets) {
         this.setupBulletNav();
         this.setActiveBullet();
       }
+
+      this.options.afterLoadComplete.call(this);
     },
-    
+
     currentSlide: function () {
       return this.$slides.eq(this.activeSlide);
     },
-    
+
     setDimentionsFromLargestSlide: function () {
       //Collect all slides and set slider size of largest image
       var self = this,
           $fluidPlaceholder;
-          
+
       self.$element.add(self.$wrapper).width(this.$slides.first().width());
       self.$element.add(self.$wrapper).height(this.$slides.first().height());
       self.orbitWidth = this.$slides.first().width();
       self.orbitHeight = this.$slides.first().height();
       $fluidPlaceholder = this.$slides.first().findFirstImage().clone();
-        
-      
+
+
       this.$slides.each(function () {
         var slide = $(this),
             slideWidth = slide.width(),
@@ -163,7 +167,7 @@
 
         if (slideWidth > self.$element.width()) {
           self.$element.add(self.$wrapper).width(slideWidth);
-          self.orbitWidth = self.$element.width();	       			
+          self.orbitWidth = self.$element.width();
         }
         if (slideHeight > self.$element.height()) {
           self.$element.add(self.$wrapper).height(slideHeight);
@@ -172,33 +176,33 @@
 	      }
         self.numberSlides += 1;
       });
-      
+
       if (this.options.fluid) {
         if (typeof this.options.fluid === "string") {
           $fluidPlaceholder = $('<img src="http://placehold.it/' + this.options.fluid + '" />')
         }
-        
+
         self.$element.prepend($fluidPlaceholder);
         $fluidPlaceholder.addClass('fluid-placeholder');
         self.$element.add(self.$wrapper).css({width: 'inherit'});
         self.$element.add(self.$wrapper).css({height: 'inherit'});
-        
+
         $(window).bind('resize', function () {
           self.orbitWidth = self.$element.width();
           self.orbitHeight = self.$element.height();
         });
       }
     },
-    
+
     //Animation locking functions
     lock: function () {
       this.locked = true;
     },
-    
-    unlock: function () { 
+
+    unlock: function () {
       this.locked = false;
     },
-    
+
     updateOptionsIfOnlyOneSlide: function () {
       if(this.$slides.length === 1) {
       	this.options.directionalNav = false;
@@ -206,7 +210,7 @@
       	this.options.bullets = false;
       }
     },
-    
+
     setupFirstSlide: function () {
       //Set initial front photo z-index and fades it in
       var self = this;
@@ -217,29 +221,29 @@
       		self.$slides.css({"display":"block"})
       });
     },
-    
+
     startClock: function () {
       var self = this;
-      
-      if(!this.options.timer) { 
+
+      if(!this.options.timer) {
     		return false;
-    	} 
+    	}
 
     	if (this.$timer.is(':hidden')) {
         this.clock = setInterval(function () {
           self.$element.trigger('orbit.next');
-        }, this.options.advanceSpeed);            		
+        }, this.options.advanceSpeed);
     	} else {
         this.timerRunning = true;
         this.$pause.removeClass('active')
         this.clock = setInterval(this.rotateTimer, this.options.advanceSpeed / 180);
       }
     },
-    
-    rotateTimer: function () {
+
+    rotateTimer: function (reset) {
       var degreeCSS = "rotate(" + this.degrees + "deg)"
       this.degrees += 2;
-      this.$rotator.css({ 
+      this.$rotator.css({
         "-webkit-transform": degreeCSS,
         "-moz-transform": degreeCSS,
         "-o-transform": degreeCSS
@@ -248,24 +252,24 @@
         this.$rotator.addClass('move');
         this.$mask.addClass('move');
       }
-      if(this.degrees > 360) {
+      if(this.degrees > 360 || reset) {
         this.$rotator.removeClass('move');
         this.$mask.removeClass('move');
         this.degrees = 0;
         this.$element.trigger('orbit.next');
       }
     },
-    
+
     stopClock: function () {
-      if (!this.options.timer) { 
-        return false; 
+      if (!this.options.timer) {
+        return false;
       } else {
         this.timerRunning = false;
         clearInterval(this.clock);
         this.$pause.addClass('active');
       }
     },
-    
+
     setupTimer: function () {
       this.$timer = $(this.timerHTML);
       this.$wrapper.append(this.$timer);
@@ -273,19 +277,19 @@
       this.$rotator = this.$timer.find('.rotator');
       this.$mask = this.$timer.find('.mask');
       this.$pause = this.$timer.find('.pause');
-      
+
       this.$timer.click(this.clickTimer);
 
       if (this.options.startClockOnMouseOut) {
         this.$wrapper.mouseleave(this.startTimerAfterMouseLeave);
         this.$wrapper.mouseenter(this.clearClockMouseLeaveTimer);
       }
-      
+
       if (this.options.pauseOnHover) {
         this.$wrapper.mouseenter(this.stopClock);
       }
     },
-    
+
     startTimerAfterMouseLeave: function () {
       var self = this;
 
@@ -295,39 +299,39 @@
         }
       }, this.options.startClockOnMouseOutAfter)
     },
-    
+
     clearClockMouseLeaveTimer: function () {
       clearTimeout(this.outTimer);
     },
-    
+
     clickTimer: function () {
       if(!this.timerRunning) {
           this.startClock();
-      } else { 
+      } else {
           this.stopClock();
       }
     },
-    
+
     setupCaptions: function () {
       this.$caption = $(this.captionHTML);
       this.$wrapper.append(this.$caption);
   	  this.setCaption();
     },
-    
+
     setCaption: function () {
       var captionLocation = this.currentSlide().attr('data-caption'),
           captionHTML;
-    		
+
       if (!this.options.captions) {
-    		return false; 
-    	} 
-    	        		
+    		return false;
+    	}
+
     	//Set HTML for the caption if it exists
     	if (captionLocation) {
     	  captionHTML = $(captionLocation).html(); //get HTML from the matching HTML entity
     		this.$caption
       		.attr('id', captionLocation) // Add ID caption TODO why is the id being set?
-          .html(captionHTML); // Change HTML in Caption 
+          .html(captionHTML); // Change HTML in Caption
           //Animations for Caption entrances
         switch (this.options.captionAnimation) {
           case 'none':
@@ -355,27 +359,35 @@
         }
     	}
     },
-    
+
     setupDirectionalNav: function () {
       var self = this,
           $directionalNav = $(this.directionalNavHTML);
-      
+
       $directionalNav.find('.right').html(this.options.directionalNavRightText);
       $directionalNav.find('.left').html(this.options.directionalNavLeftText);
 
       this.$wrapper.append($directionalNav);
-      
-      this.$wrapper.find('.left').click(function () { 
+
+      this.$wrapper.find('.left').click(function () {
         self.stopClock();
+        if (self.options.resetTimerOnClick) {
+          self.rotateTimer(true);
+          self.startClock();
+        }
         self.$element.trigger('orbit.prev');
       });
-      
+
       this.$wrapper.find('.right').click(function () {
         self.stopClock();
+        if (self.options.resetTimerOnClick) {
+          self.rotateTimer(true);
+          self.startClock();
+        }
         self.$element.trigger('orbit.next');
       });
     },
-    
+
     setupBulletNav: function () {
       this.$bullets = $(this.bulletHTML);
     	this.$wrapper.append(this.$bullets);
@@ -383,7 +395,7 @@
     	this.$element.addClass('with-bullets');
     	if (this.options.centerBullets) this.$bullets.css('margin-left', -this.$bullets.width() / 2);
     },
-    
+
     addBullet: function (index, slide) {
       var position = index + 1,
           $li = $('<li>' + (position) + '</li>'),
@@ -402,10 +414,14 @@
   		$li.data('index', index);
   		$li.click(function () {
   			self.stopClock();
+        if (self.options.resetTimerOnClick) {
+          self.rotateTimer(true);
+          self.startClock();
+        }
   			self.$element.trigger('orbit.goto', [$li.data('index')])
   		});
     },
-    
+
     setActiveBullet: function () {
       if(!this.options.bullets) { return false; } else {
     		this.$bullets.find('li')
@@ -414,7 +430,7 @@
     		  .addClass('active');
     	}
     },
-    
+
     resetAndUnlock: function () {
       this.$slides
       	.eq(this.prevActiveSlide)
@@ -422,16 +438,16 @@
       this.unlock();
       this.options.afterSlideChange.call(this, this.$slides.eq(this.prevActiveSlide), this.$slides.eq(this.activeSlide));
     },
-    
+
     shift: function (direction) {
       var slideDirection = direction;
-      
+
       //remember previous activeSlide
       this.prevActiveSlide = this.activeSlide;
-      
+
       //exit function if bullet clicked is same as the current image
       if (this.prevActiveSlide == slideDirection) { return false; }
-      
+
       if (this.$slides.length == "1") { return false; }
       if (!this.locked) {
         this.lock();
@@ -448,21 +464,21 @@
           }
         } else {
           this.activeSlide = direction;
-          if (this.prevActiveSlide < this.activeSlide) { 
+          if (this.prevActiveSlide < this.activeSlide) {
             slideDirection = "next";
-          } else if (this.prevActiveSlide > this.activeSlide) { 
+          } else if (this.prevActiveSlide > this.activeSlide) {
             slideDirection = "prev"
           }
         }
 
         //set to correct bullet
-        this.setActiveBullet();  
-             
+        this.setActiveBullet();
+
         //set previous slide z-index to one below what new activeSlide will be
         this.$slides
           .eq(this.prevActiveSlide)
-          .css({"z-index" : 2});    
-            
+          .css({"z-index" : 2});
+
         //fade
         if (this.options.animation == "fade") {
           this.$slides
@@ -470,7 +486,7 @@
             .css({"opacity" : 0, "z-index" : 3})
             .animate({"opacity" : 1}, this.options.animationSpeed, this.resetAndUnlock);
         }
-        
+
         //horizontal-slide
         if (this.options.animation == "horizontal-slide") {
           if (slideDirection == "next") {
@@ -486,9 +502,9 @@
               .animate({"left" : 0}, this.options.animationSpeed, this.resetAndUnlock);
           }
         }
-            
+
         //vertical-slide
-        if (this.options.animation == "vertical-slide") { 
+        if (this.options.animation == "vertical-slide") {
           if (slideDirection == "prev") {
             this.$slides
               .eq(this.activeSlide)
@@ -502,7 +518,7 @@
               .animate({"top" : 0}, this.options.animationSpeed, this.resetAndUnlock);
           }
         }
-        
+
         //horizontal-push
         if (this.options.animation == "horizontal-push") {
           if (slideDirection == "next") {
@@ -524,7 +540,7 @@
               .animate({"left" : this.orbitWidth}, this.options.animationSpeed);
           }
         }
-        
+
         //vertical-push
         if (this.options.animation == "vertical-push") {
           if (slideDirection == "next") {
@@ -546,7 +562,7 @@
               .animate({top : -this.orbitHeight}, this.options.animationSpeed);
           }
         }
-        
+
         this.setCaption();
       }
     }
@@ -560,7 +576,7 @@
   };
 
 })(jQuery);
-        
+
 /*!
  * jQuery imageready Plugin
  * http://www.zurb.com/playground/
@@ -569,19 +585,19 @@
  * Released under the MIT License
  */
 (function ($) {
-  
+
   var options = {};
-  
+
   $.event.special.imageready = {
-    
+
     setup: function (data, namespaces, eventHandle) {
       options = data || options;
     },
-		
+
 		add: function (handleObj) {
 		  var $this = $(this),
 		      src;
-		      
+
 	    if ( this.nodeType === 1 && this.tagName.toLowerCase() === 'img' && this.src !== '' ) {
   			if (options.forceLoad) {
   			  src = $this.attr('src');
@@ -595,12 +611,12 @@
   			}
   		}
 		},
-		
+
 		teardown: function (namespaces) {
 		  $(this).unbind('.imageready');
 		}
 	};
-	
+
 	function bindToLoad(element, callback) {
 	  var $this = $(element);
 
@@ -612,3 +628,4 @@
 
 }(jQuery));
 
+

data/vendor/assets/stylesheets/foundation/forms.css.scss

@@ -33,6 +33,12 @@
 	input.medium, textarea.medium { width: 254px; }
 	input.large, textarea.large { width: 434px; }
 	input.expand, textarea.expand { width: 100%; }
+	
+	/* Lock textareas so they can't be resized beyond their set width in webkit */
+	textarea.locked 	{ max-width: 254px; }
+    	textarea.locked.small 	{ max-width: 134px; }
+    	textarea.locked.large 	{ max-width: 434px; }
+    	textarea.locked.expand 	{ max-width: 100%; }
 
 	/* Fieldsets */
 	form fieldset { padding: 9px 9px 2px 9px; border: solid 1px #ddd; margin: 18px 0; }
@@ -89,7 +95,7 @@
 	form.custom span.custom.checkbox.checked { background-position: 0 -28px; }
 
 	form.custom div.custom.dropdown { display: block; position: relative; width: auto; height: 28px; margin-bottom: 9px; margin-top: 2px; }
-	form.custom div.custom.dropdown a.current { display: block; width: auto; line-height: 26px; min-height: 26px; padding: 0 38px 0 6px; border: solid 1px #ddd; color: #141414; background-color: #fff; }
+	form.custom div.custom.dropdown a.current { display: block; width: auto; line-height: 26px; min-height: 26px; padding: 0 38px 0 6px; border: solid 1px #ddd; color: #141414; background-color: #fff; word-wrap: nowrap; }
 	form.custom div.custom.dropdown a.selector { position: absolute; width: 26px; height: 26px; display: block; background: image-url("foundation/misc/custom-form-sprites.png") -14px 1px no-repeat; right: 0; top: 0; border: solid 1px #ddd; }
 	form.custom div.custom.dropdown:hover a.selector,
 	form.custom div.custom.dropdown.open a.selector { background-position: -14px -26px; }

data/vendor/assets/stylesheets/foundation/globals.css.scss

@@ -71,7 +71,7 @@
 	sub {vertical-align: sub;}
 	sup {vertical-align: super;}
 	
-	body { background: #fff; font-family: "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, "Lucida Grande", sans-serif; font-size: 13px; line-height: 18px; color: #555; position: relative; -webkit-font-smoothing: antialiased; }
+	body { background: #fff; font-family: "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, "Lucida Grande", sans-serif; font-size: 13px; font-size: 1.3rem; line-height: 18px; color: #555; position: relative; -webkit-font-smoothing: antialiased; }
 	
 
 

data/vendor/assets/stylesheets/foundation/grid.css.scss

@@ -17,6 +17,7 @@
 	.column, .columns { margin-left: 4.4%; float: left; min-height: 1px; position: relative; }
 	.column:first-child, .columns:first-child { margin-left: 0; }
 	[class*="column"] + [class*="column"]:last-child { float: right; }
+	[class*="column"] + [class*="column"].end { float: left; }
 	
 	.row .one 		{ width: 4.3%; }
 	.row .two 		{ width: 13%; }
@@ -109,19 +110,19 @@
 	.block-grid>li { display: block; height: auto; float: left; }
 	
 	.block-grid.two-up { margin-left: -4% }
-	.block-grid.two-up>li { margin-left: 4%; width: 46%; }
+	.block-grid.two-up>li { margin-left: 4%; width: 46%; margin-bottom: 4%;}
 /* 	.block-grid.two-up>li:nth-child(2n+1) {clear: left;} */
 	
 	.block-grid.three-up { margin-left: -2% }
-	.block-grid.three-up>li { margin-left: 2%; width: 31.3%; }
+	.block-grid.three-up>li { margin-left: 2%; width: 31.3%; margin-bottom: 2%;}
 /* 	.block-grid.three-up>li:nth-child(3n+1) {clear: left;} */
 	
 	.block-grid.four-up { margin-left: -2% }
-	.block-grid.four-up>li { margin-left: 2%; width: 23%; }
+	.block-grid.four-up>li { margin-left: 2%; width: 23%; margin-bottom: 2%;}
 /* 	.block-grid.four-up>li:nth-child(4n+1) {clear: left;} */
 	
 	.block-grid.five-up { margin-left: -1.5% }
-	.block-grid.five-up>li { margin-left: 1.5%; width: 18.5%; }
+	.block-grid.five-up>li { margin-left: 1.5%; width: 18.5%; margin-bottom: 1.5%;}
 /* 	.block-grid.five-up>li:nth-child(5n+1) {clear: left;} */
 
 

data/vendor/assets/stylesheets/foundation/mobile.css.scss

@@ -26,8 +26,8 @@
 		.column, .columns { width: auto !important; float: none; margin-left: 0; margin-right: 0; }
 		.column:last-child, .columns:last-child { margin-right: 0; float: none; }
 		[class*="column"] + [class*="column"]:last-child { float: none; }
-		[class*="column"]:before, [class*="column"]:after { content:""; display:table; }
-		[class*="column"]:after { clear: both; }
+		.column:before, .columns:before, .column:after, .columns:after { content:""; display:table; }
+		.column:after, .columns:after { clear: both; }
 		
 		.offset-by-one, .offset-by-two, .offset-by-three, .offset-by-four, .offset-by-five, .offset-by-six, .offset-by-seven, .offset-by-eight, .offset-by-nine, .offset-by-ten, .offset-by-eleven, .centered { margin-left: 0 !important; }
 		
@@ -174,6 +174,12 @@
 	
 	/* Nav Bar */
 
+	/* Modernizr-enabled tablet targeting */
+	@media only screen and (max-width: 1280px) and (min-width: 768px) {
+		.touch .nav-bar li a { font-size: 13px; font-size: 1.3rem; }
+		.touch .nav-bar li.has-flyout>a.flyout-toggle { padding: 20px; }
+	}
+
 	@media only screen and (max-width: 767px) {
 		.nav-bar { height: auto; }
 		.nav-bar>li { float: none; display: block; border-right: none; }

data/vendor/assets/stylesheets/foundation/orbit.css.scss

@@ -224,4 +224,9 @@ ul.orbit-bullets li.active {
 ul.orbit-bullets li.active.has-thumb {
     background-position: 0 0;
     border-top: 2px solid #000; }
+    
+    
+/* Correct timer in IE */
+	.timer { display: none !important; }
+	div.caption { background:transparent; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }
 

data/vendor/assets/stylesheets/foundation/ui.css.scss

@@ -227,7 +227,7 @@
 	ul.breadcrumbs li a, ul.breadcrumbs li span { text-transform: uppercase; font-size: 11px; padding-left: 12px; }
 	ul.breadcrumbs li:first-child a, ul.breadcrumbs li:first-child span { padding-left: 0; }
 	ul.breadcrumbs li:before { content: "/"; color: #aaa; }
-	ul.breadcrumbs li:first-child:before { content: ""; }
+	ul.breadcrumbs li:first-child:before { content: " "; }
 	ul.breadcrumbs li.current a { cursor: default; color: #333; }
 	ul.breadcrumbs li:hover a, ul.breadcrumbs li a:focus { text-decoration: underline; }
 	ul.breadcrumbs li.current:hover a, ul.breadcrumbs li.current a:focus { text-decoration: none; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zurb-foundation
 version: !ruby/object:Gem::Version
-  version: 2.2.0.2
+  version: 2.2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70290791276940 !ruby/object:Gem::Requirement
+  name: railties
+  requirement: &70095506911960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290791276940
+  version_requirements: *70095506911960
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70290791276260 !ruby/object:Gem::Requirement
+  requirement: &70095506911000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +35,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290791276260
+  version_requirements: *70095506911000
 description: An easy to use, powerful, and flexible framework for building prototypes
   and production code on any kind of device.
 email:
@@ -105,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2580547679821653579
+      hash: 2326784064139831020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2580547679821653579
+      hash: 2326784064139831020
 requirements: []
 rubyforge_project: foundation
 rubygems_version: 1.8.10