ZURB-foundation 2.1.5.2 → 2.2

data/stylesheets/zurb/shared/_colors.sass

@@ -5,7 +5,7 @@ $blue: #00a6fc
 $white: #fff
 $black: #000
 $red: #e91c21
-$green: #56f812
+$green: #5b8737
 $orange: #cc4714
 $yellow: #ff0
 $black: #141414

data/stylesheets/zurb/shared/_mixins.sass

@@ -1,17 +1,17 @@
 // Compass imports
-//----------------------------------------------------------------------------------------------------
+//------------------------------------------------
 
 @import compass/css3
 @import compass/utilities
 
 // Font stack
-//----------------------------------------------------------------------------------------------------
+//------------------------------------------------
 
 @mixin HelveticaFontStack
   font-family: $helvetica-font-stack
 
 // Font size mixin to include px and rem
-//----------------------------------------------------------------------------------------------------
+//------------------------------------------------
 
 @mixin font-size($size, $is-important: false)
   @if $is-important
@@ -22,7 +22,7 @@
     font-size: ($size / 10) + rem
 
 // WebKit font-smoothing
-//----------------------------------------------------------------------------------------------------
+//------------------------------------------------
 
 // References:
 //

data/templates/project/MIT-LICENSE.txt

@@ -17,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/templates/project/humans.txt

@@ -5,4 +5,4 @@
 /* SITE */
   Standards: HTML5, CSS3
   Components: jQuery, Orbit, Reveal
-  Software: Coda, TextMate, Git
+  Software: Coda, Textmate, Git

data/templates/project/index.html

@@ -14,6 +14,7 @@
 	<title>Welcome to Foundation</title>
   
 	<!-- Included CSS Files -->
+	<link rel="stylesheet" href="stylesheets/foundation.css">
 	<link rel="stylesheet" href="stylesheets/app.css">
 
 	<!--[if lt IE 9]>
@@ -31,20 +32,19 @@
 
 	<!-- container -->
 	<div class="container">
-		
+
 		<div class="row">
 			<div class="twelve columns">
 				<h2>Welcome to Foundation</h2>
-				<p>This is version 2.1.5 released on January 26, 2012</p>
-		
+				<p>This is version 2.2 released on February 21, 2012</p>
 				<hr />
 			</div>
 		</div>
-		
+
 		<div class="row">
 			<div class="eight columns">
 				<h3>The Grid</h3>
-				
+
 				<!-- Grid Example -->
 				<div class="row">
 					<div class="twelve columns">
@@ -82,36 +82,48 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<h3>Tabs</h3>
 				<dl class="tabs">
 					<dd><a href="#simple1" class="active">Simple Tab 1</a></dd>
 					<dd><a href="#simple2">Simple Tab 2</a></dd>
 					<dd><a href="#simple3">Simple Tab 3</a></dd>
 				</dl>
-				
+
 				<ul class="tabs-content">
 					<li class="active" id="simple1Tab">This is simple tab 1's content. Pretty neat, huh?</li>
 					<li id="simple2Tab">This is simple tab 2's content. Now you see it!</li>
 					<li id="simple3Tab">This is simple tab 3's content. It's, you know...okay.</li>
 				</ul>
-				
+
 				<h3>Buttons</h3>
 				
-				<p><a href="#" class="small blue button">Small Blue Button</a></p>
-				<p><a href="#" class="blue button">Medium Blue Button</a></p>
-				<p><a href="#" class="large blue button">Large Blue Button</a></p>
-				
-				<p><a href="#" class="nice radius small blue button">Nice Blue Button</a></p>
-				<p><a href="#" class="nice radius blue button">Nice Blue Button</a></p>
-				<p><a href="#" class="nice radius large blue button">Nice Blue Button</a></p>
-
+				<div class="row">
+					<div class="six columns">
+						<p><a href="#" class="small blue button">Small Blue Button</a></p>
+						<p><a href="#" class="blue button">Medium Blue Button</a></p>
+						<p><a href="#" class="large blue button">Large Blue Button</a></p>
+		
+						<p><a href="#" class="nice radius small blue button">Nice Blue Button</a></p>
+						<p><a href="#" class="nice radius blue button">Nice Blue Button</a></p>
+						<p><a href="#" class="nice radius large blue button">Nice Blue Button</a></p>
+					</div>
+					<div class="six columns">
+						<p><a href="#" class="small red button">Small Red Button</a></p>
+						<p><a href="#" class="green button">Medium Green Button</a></p>
+						<p><a href="#" class="large white button">Large White Button</a></p>
+		
+						<p><a href="#" class="nice radius small red button">Nice Red Button</a></p>
+						<p><a href="#" class="nice radius green button">Nice Green Button</a></p>
+						<p><a href="#" class="nice radius large white button">Nice White Button</a></p>
+					</div>
+				</div>
 			</div>
 
-			<div class="four columns">
+			<div class="four columns">			
 				<h4>Getting Started</h4>
 				<p>We're stoked you want to try Foundation! To get going, this file (index.html) includes some basic styles you can modify, play around with, or totally destroy to get going.</p>
-				
+
 				<h4>Other Resources</h4>
 				<p>Once you've exhausted the fun in this document, you should check out:</p>
 				<ul class="disc">
@@ -121,11 +133,11 @@
 				</ul>
 			</div>
 		</div>
-		
+
 	</div>
 	<!-- container -->
-	
-	
+
+
 
 
 	<!-- Included JS Files -->
@@ -133,11 +145,11 @@
 	<script src="javascripts/modernizr.foundation.js"></script>
 	<script src="javascripts/jquery.reveal.js"></script>
 	<script src="javascripts/jquery.orbit-1.4.0.js"></script>
-	<script src="javascripts/forms.jquery.js"></script>
 	<script src="javascripts/jquery.customforms.js"></script>
 	<script src="javascripts/jquery.placeholder.min.js"></script>
 	<script src="javascripts/jquery.tooltips.js"></script>
 	<script src="javascripts/app.js"></script>
-	
+
 </body>
+</html>
 </html>

data/templates/project/javascripts/app.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+jQuery(document).ready(function ($) {
 
 	/* Use this js doc for all application specific JS */
 
@@ -15,7 +15,7 @@ $(document).ready(function () {
 
     	//Show Tab Content
 		$(contentLocation).closest('.tabs-content').children('li').hide();
-		$(contentLocation).show();
+		$(contentLocation).css('display', 'block');
 	}
 
 	$('dl.tabs').each(function () {
@@ -44,6 +44,9 @@ $(document).ready(function () {
 
 	$('input, textarea').placeholder();
 
+	/* TOOLTIPS ------------ */
+	$(this).tooltips();
+
 
 
 	/* UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE6/7/8 SUPPORT AND ARE USING .block-grids */
@@ -68,9 +71,24 @@ $(document).ready(function () {
 		}
 		lockNavBar = true;
 	});
+  if (Modernizr.touch) {
+    $('.nav-bar>li.has-flyout>a.main').css({
+      'padding-right' : '75px'
+    });
+    $('.nav-bar>li.has-flyout>a.flyout-toggle').css({
+      'border-left' : '1px dashed #eee'
+    });
+  } else {
+    $('.nav-bar>li.has-flyout').hover(function() {
+      $(this).children('.flyout').show();
+    }, function() {
+      $(this).children('.flyout').hide();
+    })
+  }
 
 
 	/* DISABLED BUTTONS ------------- */
 	/* Gives elements with a class of 'disabled' a return: false; */
+  
 
 });

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

@@ -33,7 +33,17 @@ jQuery(document).ready(function ($) {
         $li;
 
     if ($customSelect.length === 0) {
-      $customSelect = $('<div class="custom dropdown"><a href="#" class="selector"></a><ul></ul></div>"');
+      $customSelectSize = '';
+      if ($(sel).hasClass('small')) {
+      	$customSelectSize = 'small';
+      } else if ($(sel).hasClass('medium')) {
+      	$customSelectSize = 'medium';
+      } else if ($(sel).hasClass('large')) {
+      	$customSelectSize = 'large';
+      } else if ($(sel).hasClass('expand')) {
+      	$customSelectSize = 'expand';
+      }
+      $customSelect = $('<div class="custom dropdown ' + $customSelectSize + '"><a href="#" class="selector"></a><ul></ul></div>"');
       $options.each(function () {
         $li = $('<li>' + $(this).html() + '</li>');
         $customSelect.find('ul').append($li);
@@ -68,8 +78,11 @@ jQuery(document).ready(function ($) {
       }
       $customSelect.removeClass('open');
     });
-    $customSelect.css('width', maxWidth + 18 + 'px');
-    $customSelect.find('ul').css('width', maxWidth + 16 + 'px');
+    
+    if (!$customSelect.is('.small, .medium, .large, .expand')) {
+      $customSelect.css('width', maxWidth + 18 + 'px');
+      $customSelect.find('ul').css('width', maxWidth + 16 + 'px');
+    }
 
   }
 
@@ -181,7 +194,7 @@ jQuery(document).ready(function ($) {
         $select = $dropdown.prev();
     
     event.preventDefault();
-    
+
     if (false == $select.is(':disabled')) {
         $dropdown.toggleClass('open');
 
@@ -193,6 +206,7 @@ jQuery(document).ready(function ($) {
         } else {
           $(document).unbind('.customdropdown');
         }
+        return false;
     }
   });
   

data/templates/project/javascripts/jquery.orbit-1.4.0.js

@@ -27,6 +27,8 @@
       startClockOnMouseOut: false, 		// if clock should start on MouseOut
       startClockOnMouseOutAfter: 1000, 	// how long after MouseOut should the timer start again
       directionalNav: true, 				// manual advancing directional navs
+      directionalNavRightText: 'Right', // text of right directional element for accessibility
+      directionalNavLeftText: 'Left', // text of left directional element for accessibility
       captions: true, 					// do you want captions?
       captionAnimation: 'fade', 			// fade, slideOpen, none
       captionAnimationSpeed: 600, 		// if so how quickly should they animate in
@@ -48,7 +50,7 @@
     wrapperHTML: '<div class="orbit-wrapper" />',
     timerHTML: '<div class="timer"><span class="mask"><span class="rotator"></span></span><span class="pause"></span></div>',
     captionHTML: '<div class="orbit-caption"></div>',
-    directionalNavHTML: '<div class="slider-nav"><span class="right">Right</span><span class="left">Left</span></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) {
@@ -355,9 +357,13 @@
     },
     
     setupDirectionalNav: function () {
-      var self = this;
+      var self = this,
+          $directionalNav = $(this.directionalNavHTML);
+      
+      $directionalNav.find('.right').html(this.options.directionalNavRightText);
+      $directionalNav.find('.left').html(this.options.directionalNavLeftText);
 
-      this.$wrapper.append(this.directionalNavHTML);
+      this.$wrapper.append($directionalNav);
       
       this.$wrapper.find('.left').click(function () { 
         self.stopClock();

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

@@ -5,7 +5,7 @@
  * Free to use under the MIT license.
  * http://www.opensource.org/licenses/mit-license.php
 */
-
+/*globals jQuery */
 
 (function ($) {
   $('a[data-reveal-id]').live('click', function (event) {
@@ -19,108 +19,134 @@
       animation: 'fadeAndPop',                // fade, fadeAndPop, none
       animationSpeed: 300,                    // how fast animtions are
       closeOnBackgroundClick: true,           // if you click background will modal close?
-      dismissModalClass: 'close-reveal-modal' // the class of a button or element that will close an open modal
+      dismissModalClass: 'close-reveal-modal', // the class of a button or element that will close an open modal
+      open: $.noop,
+      opened: $.noop,
+      close: $.noop,
+      closed: $.noop
     };
-    var options = $.extend({}, defaults, options);
+    options = $.extend({}, defaults, options);
 
     return this.each(function () {
       var modal    = $(this),
-        topMeasure = parseInt(modal.css('top')),
+        topMeasure = parseInt(modal.css('top'), 10),
         topOffset  = modal.height() + topMeasure,
         locked     = false,
-        modalBg    = $('.reveal-modal-bg');
+        modalBg    = $('.reveal-modal-bg'),
+        closeButton;
 
-      if (modalBg.length == 0) {
+      if (modalBg.length === 0) {
         modalBg = $('<div class="reveal-modal-bg" />').insertAfter(modal);
         modalBg.fadeTo('fast', 0.8);
       }
+      
+      function unlockModal() {
+        locked = false;
+      }
+
+      function lockModal() {
+        locked = true;
+      }
 
       function openAnimation() {
-        modalBg.unbind('click.modalEvent');
-        $('.' + options.dismissModalClass).unbind('click.modalEvent');
         if (!locked) {
           lockModal();
-          if (options.animation == "fadeAndPop") {
+          if (options.animation === "fadeAndPop") {
             modal.css({'top': $(document).scrollTop() - topOffset, 'opacity': 0, 'visibility': 'visible'});
             modalBg.fadeIn(options.animationSpeed / 2);
             modal.delay(options.animationSpeed / 2).animate({
               "top": $(document).scrollTop() + topMeasure + 'px',
               "opacity": 1
-            }, options.animationSpeed, unlockModal);
+            }, options.animationSpeed, function () {
+              modal.trigger('reveal:opened');
+            });
+
           }
-          if (options.animation == "fade") {
+          if (options.animation === "fade") {
             modal.css({'opacity': 0, 'visibility': 'visible', 'top': $(document).scrollTop() + topMeasure});
             modalBg.fadeIn(options.animationSpeed / 2);
             modal.delay(options.animationSpeed / 2).animate({
               "opacity": 1
-            }, options.animationSpeed, unlockModal);
+            }, options.animationSpeed, function () {
+              modal.trigger('reveal:opened');
+            });
+
           }
-          if (options.animation == "none") {
+          if (options.animation === "none") {
             modal.css({'visibility': 'visible', 'top': $(document).scrollTop() + topMeasure});
             modalBg.css({"display": "block"});
-            unlockModal();
+            modal.trigger('reveal:opened');
           }
         }
-        modal.unbind('reveal:open', openAnimation);
       }
-      modal.bind('reveal:open', openAnimation);
+      modal.bind('reveal:open.reveal', openAnimation);
 
       function closeAnimation() {
         if (!locked) {
           lockModal();
-          if (options.animation == "fadeAndPop") {
-            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed);
+          if (options.animation === "fadeAndPop") {
             modal.animate({
               "top":  $(document).scrollTop() - topOffset + 'px',
               "opacity": 0
             }, options.animationSpeed / 2, function () {
               modal.css({'top': topMeasure, 'opacity': 1, 'visibility': 'hidden'});
-              unlockModal();
+            });
+            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed, function () {
+              modal.trigger('reveal:closed');
             });
           }
-          if (options.animation == "fade") {
-            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed);
+          if (options.animation === "fade") {
             modal.animate({
               "opacity" : 0
             }, options.animationSpeed, function () {
               modal.css({'opacity': 1, 'visibility': 'hidden', 'top': topMeasure});
-              unlockModal();
+            });
+            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed, function () {
+              modal.trigger('reveal:closed');
             });
           }
-          if (options.animation == "none") {
+          if (options.animation === "none") {
             modal.css({'visibility': 'hidden', 'top': topMeasure});
             modalBg.css({'display': 'none'});
+            modal.trigger('reveal:closed');
           }
         }
-        modal.unbind('reveal:close', closeAnimation);
       }
-      modal.bind('reveal:close', closeAnimation);
+
+      function destroy() {
+        modal.unbind('.reveal');
+        modalBg.unbind('.reveal');
+        $('.' + options.dismissModalClass).unbind('.reveal');
+        $('body').unbind('.reveal');
+      }
+
+      modal.bind('reveal:close.reveal', closeAnimation);
+      modal.bind('reveal:opened.reveal reveal:closed.reveal', unlockModal);
+      modal.bind('reveal:closed.reveal', destroy);
+      
+      modal.bind('reveal:open.reveal', options.open);
+      modal.bind('reveal:opened.reveal', options.opened);
+      modal.bind('reveal:close.reveal', options.close);
+      modal.bind('reveal:closed.reveal', options.closed);
+      
       modal.trigger('reveal:open');
 
-      var closeButton = $('.' + options.dismissModalClass).bind('click.modalEvent', function () {
+      closeButton = $('.' + options.dismissModalClass).bind('click.reveal', function () {
         modal.trigger('reveal:close');
       });
 
       if (options.closeOnBackgroundClick) {
         modalBg.css({"cursor": "pointer"});
-        modalBg.bind('click.modalEvent', function () {
+        modalBg.bind('click.reveal', function () {
           modal.trigger('reveal:close');
         });
       }
 
-      $('body').keyup(function (event) {
+      $('body').bind('keyup.reveal', function (event) {
         if (event.which === 27) { // 27 is the keycode for the Escape key
           modal.trigger('reveal:close');
         }
       });
-
-      function unlockModal() {
-        locked = false;
-      }
-
-      function lockModal() {
-        locked = true;
-      }
     });
   };
-})(jQuery);
+} (jQuery));