ZURB-foundation 2.2.0.1 → 2.2.1

data/README.mkdn

@@ -18,7 +18,7 @@ In Terminal:
 * `git clone git://github.com/zurb/foundation-sass.git`
 * `cd foundation-sass`
 * `sudo gem build ZURB-foundation.gemspec`
-* `sudo gem install ZURB-foundation-2.2.0.1.gem`
+* `sudo gem install ZURB-foundation-2.2.1.gem`
 
 To create your first project
 ----------------------------
@@ -39,7 +39,6 @@ Custom Settings
 ---------------------------------------------
 Work with your own custom settings by adjusting the _settings.sass file in a new project!
 
-
 Welcome to Foundation
 =====================
 
@@ -47,7 +46,7 @@ Foundation is a rock-solid, responsive framework for rapidly prototyping and ite
 
 Homepage:      http://foundation.zurb.com  
 Documentation: http://foundation.zurb.com/docs  
-Download:      http://foundation.zurb.com/files/foundation-download-2.2.zip  
+Download:      http://foundation.zurb.com/files/foundation-download-2.2.1.zip  
 
 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).
 
@@ -80,6 +79,10 @@ WordPress
 * [Starter Theme](https://github.com/drewsymo/Foundation) by Drew Morris
 * [Reverie](http://themefortress.com/reverie/) by Zhen
 
+Joomla
+
+* [Joomla Template](https://github.com/meridiansoftech/joomla_foundation_template) by Arnold Mwumva Ford, Meridian Softech
+
 Drupal
 
 * [Drupal Theme](https://github.com/drewkennelly/foundation7) by Drew Kennelly
@@ -90,7 +93,7 @@ MODX
 
 .NET
 
-* [NuGet Package for ASP.Net MVC](http://nuget.org/List/Packages/Zurb_Foundation_MPC3) by Edward Charbeneau, @EdCharbeneau
+* [NuGet Package for ASP.Net MVC](http://www.nuget.org/packages/Zurb_Foundation_MVC3) by Edward Charbeneau, @EdCharbeneau
 
 Other Implementations
 
@@ -110,6 +113,10 @@ Grid Generator
 
 * [Experimental Grid Generator](http://www.gridlover.net/foundation/) courtesy of [Ville Vanninen](http://foolproof.me)
 
+Grid displayer
+
+* [Grid displayer bookmarklet](http://alefeuvre.github.com/foundation-grid-displayer/) by [Antoine Lefeuvre](http://twitter.com/jiraisurfer)
+
 MIT Open Source License
 =======================
 
@@ -117,4 +124,5 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/ZURB-foundation.rb

@@ -3,7 +3,7 @@ Compass::Frameworks.register("ZURB-foundation", :path => File.join(File.dirname(
 
 module ZURBfoundation
   
-  VERSION = "2.2.0.1"
-  DATE = "2012-03-01"
+  VERSION = "2.2.1"
+  DATE = "2012-04-24"
 
 end

data/stylesheets/zurb/_buttons.sass

@@ -40,7 +40,7 @@ button::-moz-focus-inner, input[type="reset"]::-moz-focus-inner, input[type="but
   &.radius
     +border-radius(3px)
   &.round
-    +border-radius(3px)
+    +border-radius(1000px)
   &.full-width
     width: 100%
     padding-left: 0 !important
@@ -131,4 +131,4 @@ button::-moz-focus-inner, input[type="reset"]::-moz-focus-inner, input[type="but
   input[type=submit].medium.button
     padding: 8px 34px 9px
   input[type=submit].large.button
-    padding: 9px 48px 20px
+    padding: 9px 48px 10px

data/stylesheets/zurb/_forms.sass

@@ -18,6 +18,8 @@ input.input-text, textarea, select
   margin-bottom: 9px
 label + input.input-text, label + textarea, label + select, label + div.dropdown, select + div.dropdown
   margin-top: -9px
+textarea
+  max-width: 100%
   
 // Text input and textarea font and padding
 //-----------------------------------------
@@ -60,6 +62,19 @@ input, textarea
   &.expand
     width: 100%
 
+// Lock textareas so they can't be resized
+// beyond their set width in webkit
+//-----------------------------------------
+textarea
+  &.locked
+    max-width: 254px
+    &.small
+      max-width: 134px
+    &.large
+      max-width: 434px
+    &.expand
+      max-width: 100%
+
 // Fieldsets
 //-----------------------------------------
 
@@ -129,6 +144,8 @@ form.nice
       +border-radius(3px)
     div.form-field input[disabled], input.input-text[disabled], textarea[disabled]
       background: #ddd
+    fieldset
+      +border-radius(3px)
     div.form-field input[type=radio], div.form-field input[type=checkbox]
       display: inline
       width: auto
@@ -197,6 +214,7 @@ form.custom
         border: solid 1px #ddd
         color: #141414
         background-color: #fff
+        word-wrap: nowrap
       a.selector
         position: absolute
         width: 26px
@@ -238,12 +256,31 @@ form.custom
         ul
           display: block
           z-index: 10
+        &.small
+          ul
+            width: 132px !important
+        &.medium
+          ul
+            width: 252px !important
+        &.large
+          ul
+            width: 432px !important
+        &.expand
+          ul
+            width: 100% !important
+      &.small
+        width: 134px !important
+      &.medium
+        width: 254px !important
+      &.large
+        width: 434px !important
+      &.expand
+        width: 100% !important
   
   // Custom input, disabled
   .custom.disabled
     background-color: #ddd
   
-  
   // Nicer Customer Forms
   &.nice
     span.custom.checkbox

data/stylesheets/zurb/_globals.sass

@@ -119,9 +119,6 @@ table
       &:nth-child(even)
         background: #f9f9f9
       td
-        +font-size(12)
-        line-height: 18px
-        text-align: left
         color: #333
         padding: 9px 10px
         vertical-align: top

data/stylesheets/zurb/_mobile.sass

@@ -279,7 +279,7 @@ table
       top: 0
       height: auto
   .nice.tabs.mobile dd:first-child a.active
-    margin-bottom: 0
+    margin: 0
   
   dl.contained.mobile, dl.nice.contained.mobile
     margin-bottom: 0
@@ -292,7 +292,19 @@ table
     margin-right: -20px
     border-width: 0 0 1px 0
 
-  // Nav Bar with Dropdowns
+// Modernizr-enabled tablet targeting
+@media only screen and (max-width: 1280px) and (min-width: 768px)
+  .touch
+    .nav-bar
+      li
+        a
+          +font-size(13)
+        &.has-flyout
+          &>a.flyout-toggle
+            padding: 20px
+
+// Nav Bar with Dropdowns
+@media only screen and (max-width: 767px)
   .nav-bar
     height: auto
     & > li

data/stylesheets/zurb/_orbit.sass

@@ -197,4 +197,12 @@ ul.orbit-bullets
       &.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/stylesheets/zurb/_typography.sass

@@ -5,7 +5,8 @@
   color: #181818
   font-weight: bold
   line-height: 1.25
-
+  a
+    font-weight: inherit
 h1
   +font-size(46)
   margin-bottom: 12px
@@ -50,6 +51,8 @@ strong, b
 small
   font-size: 60%
   line-height: inherit
+h1 small, h2 small, h3 small, h4 small, h5 small
+  color: #777
 
 // Blockquotes
 //--------------------------------------------
@@ -65,7 +68,7 @@ blockquote
     +font-size(12)
     color: #555
     &:before
-      content: "/2014 /0020"
+      content: "\2014 \0020"
     a, a:visited
       color: #555
 

data/stylesheets/zurb/_ui.sass

@@ -148,7 +148,7 @@ dl.tabs
           background: #fff
           border-left: 1px solid #eee
           border-right: 1px solid #eee
-          border-top: 1px solid #00a6fc
+          border-top: 3px solid #00a6fc
           margin: 0 10px
           position: relative
           top: -5px
@@ -529,6 +529,8 @@ p.vevent abbr
     left: -10px
   &.noradius
     +border-radius(0px)
+  &.tip-left, .tip-right
+    float: none !important
 .has-tip
   &.opened
     color: $default-color !important
@@ -537,7 +539,6 @@ p.vevent abbr
     float: none !important
 .tap-to-close
   display: block
-  font-size: 10px
-  font-size: 1.0rem
+  +font-size(10)
   color: #888
   font-weight: normal

data/stylesheets/zurb/shared/_colors.sass

@@ -8,6 +8,6 @@ $red: #e91c21
 $green: #5b8737
 $orange: #cc4714
 $yellow: #ff0
-$black: #141414
+$charcoal: #141414
 
 $default-color: $blue !default

data/templates/project/index.html

@@ -4,24 +4,34 @@
 <!--[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 lang="en"> <!--<![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <head>
 	<meta charset="utf-8" />
-	
+
 	<!-- Set the viewport width to device width for mobile -->
 	<meta name="viewport" content="width=device-width" />
-	
+
 	<title>Welcome to Foundation</title>
   
 	<!-- Included CSS Files -->
-	<link rel="stylesheet" href="stylesheets/foundation.css">
+	<!-- Combine and Compress These CSS Files -->
+	<link rel="stylesheet" href="stylesheets/globals.css">
+	<link rel="stylesheet" href="stylesheets/typography.css">
+	<link rel="stylesheet" href="stylesheets/grid.css">
+	<link rel="stylesheet" href="stylesheets/ui.css">
+	<link rel="stylesheet" href="stylesheets/forms.css">
+	<link rel="stylesheet" href="stylesheets/orbit.css">
+	<link rel="stylesheet" href="stylesheets/reveal.css">
+	<link rel="stylesheet" href="stylesheets/mobile.css">
+	<!-- End Combine and Compress These CSS Files -->
 	<link rel="stylesheet" href="stylesheets/app.css">
 
 	<!--[if lt IE 9]>
 		<link rel="stylesheet" href="stylesheets/ie.css">
 	<![endif]-->
-
 	
+	<script src="javascripts/modernizr.foundation.js"></script>
+
 	<!-- IE Fix for HTML5 Tags -->
 	<!--[if lt IE 9]>
 		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -36,7 +46,7 @@
 		<div class="row">
 			<div class="twelve columns">
 				<h2>Welcome to Foundation</h2>
-				<p>This is version 2.2 released on February 21, 2012</p>
+				<p>This is version 2.2.1 released on April 10, 2012</p>
 				<hr />
 			</div>
 		</div>
@@ -142,12 +152,13 @@
 
 	<!-- Included JS Files -->
 	<script src="javascripts/jquery.min.js"></script>
-	<script src="javascripts/modernizr.foundation.js"></script>
+	<!-- Combine and Compress These JS Files -->
 	<script src="javascripts/jquery.reveal.js"></script>
 	<script src="javascripts/jquery.orbit-1.4.0.js"></script>
 	<script src="javascripts/jquery.customforms.js"></script>
 	<script src="javascripts/jquery.placeholder.min.js"></script>
 	<script src="javascripts/jquery.tooltips.js"></script>
+	<!-- End Combine and Compress These JS Files -->
 	<script src="javascripts/app.js"></script>
 
 </body>

data/templates/project/javascripts/app.js

@@ -8,26 +8,26 @@ 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');
 	}
 
-	$('dl.tabs').each(function () {
-		//Get all tabs
-		var tabs = $(this).children('dd').children('a');
-		tabs.click(function (e) {
-			activateTab($(this));
-		});
-	});
+  $('dl.tabs dd a').live('click', function (event) {
+    activateTab($(this));
+  });
 
 	if (window.location.hash) {
 		activateTab($('a[href="' + window.location.hash + '"]'));
+		$.foundation.customForms.appendCustomMarkup();
 	}
 
 	/* ALERT BOXES ------------ */
@@ -90,5 +90,4 @@ jQuery(document).ready(function ($) {
 	/* DISABLED BUTTONS ------------- */
 	/* Gives elements with a class of 'disabled' a return: false; */
   
-
-});
+});

data/templates/project/javascripts/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/templates/project/javascripts/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);
 
@@ -610,4 +626,4 @@
      });
 	}
 
-}(jQuery));
+}(jQuery));

data/templates/project/javascripts/jquery.reveal.js

@@ -149,4 +149,4 @@
       });
     });
   };
-} (jQuery));
+} (jQuery));

data/templates/project/javascripts/jquery.tooltips.js

@@ -13,9 +13,9 @@
   };
 
   var methods = {
-    init : function( options ) { 
+    init : function( options ) {
 
-      return this.each(function() {    
+      return this.each(function() {
         var targets = $('.has-tip'),
         tips = $('.tooltip'),
         tipTemplate = function(target, content) {
@@ -50,7 +50,7 @@
             });
             methods.reposition(target, tip, classes);
           });
-            
+
         });
 
         if (Modernizr.touch) {
@@ -71,7 +71,7 @@
             targets.attr('title', "");
           }, function() {
             $('span[data-id=' + $(this).data('id') + '].tooltip').fadeOut(150);
-          }); 
+          });
         }
 
       });
@@ -81,7 +81,7 @@
       nub = tip.children('.nub'),
       nubHeight = nub.outerHeight(),
       nubWidth = nub.outerWidth();
-      
+
       function nubPos(nub, top, right, bottom, left) {
         nub.css({
           'top' : top,
@@ -104,23 +104,22 @@
         nubPos(nub, -nubHeight, 'auto', 'auto', target.offset().left);
       } else {
         if (classes.indexOf('tip-top') > -1) {
-          var top = target.offset().top - tip.outerHeight() - nubHeight;
           tip.css({
-            'top' : top,
+            'top' : target.offset().top - tip.outerHeight() - nubHeight,
             'left' : target.offset().left,
             'width' : width
           }).removeClass('tip-override');
           nubPos(nub, 'auto', 'auto', -nubHeight, 'auto');
         } else if (classes.indexOf('tip-left') > -1) {
           tip.css({
-            'top' : target.offset().top - (target.outerHeight() / 2) - (nubHeight / 2),
+            'top' : target.offset().top + (target.outerHeight() / 2) - nubHeight,
             'left' : target.offset().left - tip.outerWidth() - 10,
             'width' : width
           }).removeClass('tip-override');
           nubPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), -nubHeight, 'auto', 'auto');
         } else if (classes.indexOf('tip-right') > -1){
           tip.css({
-            'top' : target.offset().top - (target.outerHeight() / 2) - (nubHeight / 2),
+            'top' : target.offset().top + (target.outerHeight() / 2) - nubHeight,
             'left' : target.offset().left + target.outerWidth() + 10,
             'width' : width
           }).removeClass('tip-override');
@@ -138,14 +137,14 @@
   };
 
   $.fn.tooltips = 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.tooltips' );
-    }    
-  
+    }
+
   };
-})(jQuery);;
+})(jQuery);;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZURB-foundation
 version: !ruby/object:Gem::Version
-  version: 2.2.0.1
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70305631093660 !ruby/object:Gem::Requirement
+  requirement: &70147250209440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70305631093660
+  version_requirements: *70147250209440
 description: ZURB Foundation ported over to work with the power of Compass.
 email: foundation@zurb.com
 executables: []