zurb-foundation 2.1.3.1 → 2.1.4

data/lib/foundation/version.rb

@@ -1,4 +1,4 @@
 module Foundation
-  COMMIT = "65920cc5c72c1dc82902e29afd9fa97ab5982535"
-  VERSION = "2.1.3.1"
+  COMMIT = "46e71bf06a61fdb8adf3d41aa754a93c61757c59"
+  VERSION = "2.1.4"
 end

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

@@ -29,10 +29,11 @@ $(document).ready(function () {
 	if (window.location.hash) {
 		activateTab($('a[href="' + window.location.hash + '"]'));
 	}
-	
+
 	/* ALERT BOXES ------------ */
-	$(".alert-box").delegate("a.close", "click", function() {
-	  $(this).closest(".alert-box").fadeOut(function(){
+	$(".alert-box").delegate("a.close", "click", function(event) {
+    event.preventDefault();
+	  $(this).closest(".alert-box").fadeOut(function(event){
 	    $(this).remove();
 	  });
 	});
@@ -43,40 +44,48 @@ $(document).ready(function () {
 
 	$('input, textarea').placeholder();
 
+
+
+	/* UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE6/7/8 SUPPORT AND ARE USING .block-grids */
+//	$('.block-grid.two-up>li:nth-child(2n+1)').css({clear: 'left'});
+//	$('.block-grid.three-up>li:nth-child(3n+1)').css({clear: 'left'});
+//	$('.block-grid.four-up>li:nth-child(4n+1)').css({clear: 'left'});
+//	$('.block-grid.five-up>li:nth-child(5n+1)').css({clear: 'left'});
+
+
+
 	/* DROPDOWN NAV ------------- */
-	/*
+
+	var currentFoundationDropdown = null;
 	$('.nav-bar li a, .nav-bar li a:after').each(function() {
 		$(this).data('clicks', 0);
 	});
-	$('.nav-bar li a, .nav-bar li a:after').bind('touchend click', function(e){
-		e.stopPropagation();
+	$('.nav-bar li a, .nav-bar li a:after').live('click', function(e) {
 		e.preventDefault();
-		var f = $(this).siblings('.flyout');
+		if (currentFoundationDropdown !== $(this).index() || currentFoundationDropdown === null) {
+			$(this).data('clicks', 0);
+			currentFoundationDropdown = $(this).index();
+		}
 		$(this).data('clicks', ($(this).data('clicks') + 1));
-		if (!f.is(':visible') && f.length > 0) {
+		var f = $(this).siblings('.flyout');
+		if (!f.is(':visible') && $(this).parent('.has-flyout').length > 1) {
 			$('.nav-bar li .flyout').hide();
 			f.show();
-		}
-	});
-	$('.nav-bar li a, .nav-bar li a:after').bind(' touchend click', function(e) {
-		e.stopPropagation();
-		e.preventDefault();
-		if ($(this).data('clicks') > 1) {
+		} else if (($(this).data('clicks') > 1) || ($(this).parent('.has-flyout').length < 1)) {
 			window.location = $(this).attr('href');
 		}
 	});
-	$('.nav-bar').bind('touchend click', function(e) {
+	$('.nav-bar').live('click', function(e) {
 		e.stopPropagation();
-		if (!$(e.target).parents('.nav-bar li .flyout') || $(e.target) != $('.nav-bar li .flyout')) {
+		if ($(e.target).parents().is('.flyout') || $(e.target).is('.flyout')) {
 			e.preventDefault();
 		}
 	});
-	$('body').bind('touchend', function(e) {
-		if (!$(e.target).parents('.nav-bar li .flyout') || $(e.target) != $('.nav-bar li .flyout')) {
-			$('.nav-bar li .flyout').hide();
-		}
-	});
-	*/
+	// $('body').bind('touchend', function(e) {
+	// 	if (!$(e.target).parents().is('.nav-bar') || !$(e.target).is('.nav-bar')) {
+	// 		$('.nav-bar li .flyout').is(':visible').hide();
+	// 	}
+	// });
 
 	/* DISABLED BUTTONS ------------- */
 	/* Gives elements with a class of 'disabled' a return: false; */

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

@@ -55,6 +55,29 @@
 	.row .offset-by-ten:first-child 	{ margin-left: 87%;  }
 	.row .offset-by-eleven:first-child 	{ margin-left: 95.7%;  }
 	
+	/* Source Ordering */
+	.push-two 		{ left: 17.4% }
+	.push-three 	{ left: 26.1%; }
+	.push-four 		{ left: 34.8%; }
+	.push-five 		{ left: 43.5%; }
+	.push-six 		{ left: 52.2%; }
+	.push-seven 	{ left: 60.9%; }
+	.push-eight 	{ left: 69.6%; }
+	.push-nine 		{ left: 78.3%; }
+	.push-ten 		{ left: 87%; }
+	
+	.pull-two 		{ right: 17.4% }
+	.pull-three 	{ right: 26.1%; }
+	.pull-four 		{ right: 34.8%; }
+	.pull-five 		{ right: 43.5%; }
+	.pull-six 		{ right: 52.2%; }
+	.pull-seven 	{ right: 60.9%; }
+	.pull-eight 	{ right: 69.6%; }
+	.pull-nine 		{ right: 78.3%; }
+	.pull-ten 		{ right: 87%; }
+	
+	
+	
 	img, object, embed { max-width: 100%; height: auto; }
 	img { -ms-interpolation-mode: bicubic; }
 	 
@@ -73,6 +96,11 @@
 	for repeating blocks of content. Add 'mobile' to
 	them to switch them just like the layout grid
 	(one item per line) on phones
+	
+	For IE7/8 compatibility block-grid items need to be
+	the same height. You can optionally uncomment the
+	lines below to support arbitrary height, but know
+	that IE7/8 do not support :nth-child.
 	-------------------------------------------------- */
 	
 	.block-grid { display: block; overflow: hidden; }
@@ -80,15 +108,19 @@
 	
 	.block-grid.two-up { margin-left: -4% }
 	.block-grid.two-up>li { margin-left: 4%; width: 46%; }
+/* 	.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: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: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:nth-child(5n+1) {clear: left;} */
 
 
 

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

@@ -31,8 +31,11 @@
 		.row .row .column, .row .row .columns { padding: 0; }
 		.column, .columns { width: auto !important; float: none; margin-left: 0; margin-right: 0; }
 		.column:last-child, .columns:last-child { margin-right: 0; }
+		
 		.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; }
 		
+		.push-two, .push-three, .push-four, .push-five, .push-six, .push-seven, .push-eight, .push-nine, .push-ten { left: auto; }
+		.pull-two, .pull-three, .pull-four, .pull-five, .pull-six, .pull-seven, .pull-eight, .pull-nine, .pull-ten { right: auto; }
 		
 		/* Mobile 4-column Grid */
 		.row .phone-one.column:first-child, .row .phone-two.column:first-child, .row .phone-three.column:first-child, .row .phone-four.column:first-child, .row .phone-one.columns:first-child, .row .phone-two.columns:first-child, .row .phone-three.columns:first-child, .row .phone-four.columns:first-child { margin-left: 0; }
@@ -40,10 +43,18 @@
 		.row .phone-one.column, .row .phone-two.column, .row .phone-three.column, .row .phone-four.column,
 		.row .phone-one.columns, .row .phone-two.columns, .row .phone-three.columns, .row .phone-four.columns { margin-left: 4.4%; float: left; min-height: 1px; position: relative; padding: 0; }
 		
-		.row .phone-one.columns { width: 21.68% !important; }
-		.row .phone-two.columns { width: 47.8% !important; }
-		.row .phone-three.columns { width: 73.9% !important; }
-		.row .phone-four.columns { width: 100% !important; }
+		.row .phone-one.columns 	{ width: 21.68% !important; }
+		.row .phone-two.columns 	{ width: 47.8% !important; }
+		.row .phone-three.columns 	{ width: 73.9% !important; }
+		.row .phone-four.columns 	{ width: 100% !important; }
+		
+		.row .columns.push-one-phone { left: 26.08%; }
+		.row .columns.push-two-phone { left: 52.2% }
+		.row .columns.push-three-phone { left: 78.3% }
+		
+		.row .columns.pull-one-phone { right: 26.08% }
+		.row .columns.pull-two-phone { right: 52.2% }
+		.row .columns.pull-three-phone { right: 78.3%; }
 		
 		
 	}
@@ -178,5 +189,11 @@
 		.flyout.small, .flyout.large { width: auto; }
 		.flyout p:last-child { margin-bottom: 18px; }
 	}
+	
+	/* Nav Bar */
+	
+	@media only screen and (max-device-width: 800px), only screen and (device-width: 1024px) and (device-height: 600px), only screen and (width: 1280px) and (orientation: landscape), only screen and (device-width: 800px), only screen and (max-width: 767px) {
+		.video { padding-top: 0; }
+	}
 
 

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

@@ -24,7 +24,7 @@
 	
 	h1 small, h2 small, h3 small, h4 small, h5 small { color: #777; }
 	
-/*	Blockquotes  */
+	/*	Blockquotes  */
 	blockquote, blockquote p { line-height: 20px; color: #777; }
 	blockquote { margin: 0 0 18px; padding: 9px 20px 0 19px; border-left: 1px solid #ddd; }
 	blockquote cite { display: block; font-size: 12px; font-size: 1.2rem; color: #555; }
@@ -42,19 +42,22 @@
 	 * Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/
 	 * Credit to Paul Irish and HTML5 Boilerplate (html5boilerplate.com)
 	 */
+	.print-only { display: none !important; }
 	@media print {
-	  * { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important;
-	  -ms-filter: none !important; } /* Black prints faster: sanbeiji.com/archives/953 */
-	  p a, p a:visited { color: #444 !important; text-decoration: underline; }
-	  p a[href]:after { content: " (" attr(href) ")"; }
-	  abbr[title]:after { content: " (" attr(title) ")"; }
-	  .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }  /* Don't show links for images, or javascript/internal links */
-	  pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
-	  thead { display: table-header-group; } /* css-discuss.incutio.com/wiki/Printing_Tables */
-	  tr, img { page-break-inside: avoid; }
-	  @page { margin: 0.5cm; }
-	  p, h2, h3 { orphans: 3; widows: 3; }
-	  h2, h3{ page-break-after: avoid; }
+		* { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important;
+		-ms-filter: none !important; } /* Black prints faster: sanbeiji.com/archives/953 */
+		p a, p a:visited { color: #444 !important; text-decoration: underline; }
+		p a[href]:after { content: " (" attr(href) ")"; }
+		abbr[title]:after { content: " (" attr(title) ")"; }
+		.ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }  /* Don't show links for images, or javascript/internal links */
+		pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
+		thead { display: table-header-group; } /* css-discuss.incutio.com/wiki/Printing_Tables */
+		tr, img { page-break-inside: avoid; }
+		@page { margin: 0.5cm; }
+		p, h2, h3 { orphans: 3; widows: 3; }
+		h2, h3{ page-break-after: avoid; }
+		.hide-on-print { display: none !important; }
+		.print-only { display: block !important; }
 	}
 
 

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

@@ -13,6 +13,7 @@
 :: Lists
 :: Panels
 :: Nav
+:: Video
 :: Microformats
 */
 
@@ -216,6 +217,34 @@
 	.nav-bar>li:hover .flyout { display: block; }
 
 
+/*	--------------------------------------------------
+   	Video
+   	Mad props to http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
+	-------------------------------------------------- */
+	
+	.flex-video {
+		position: relative;
+		padding-top: 25px;
+		padding-bottom: 67.5%;
+		height: 0;
+		margin-bottom: 16px;
+		overflow: hidden;
+	}
+	
+	.flex-video.widescreen { padding-bottom: 57.25%; }
+	.flex-video.vimeo { padding-top: 0; }
+	
+	.flex-video iframe,
+	.flex-video object,
+	.flex-video embed {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+
+
 
 /*	--------------------------------------------------
    	Microformats

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zurb-foundation
 version: !ruby/object:Gem::Version
-  version: 2.1.3.1
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 -08:00
+date: 2011-12-19 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2154910460 !ruby/object:Gem::Requirement
+  requirement: &2153306600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154910460
+  version_requirements: *2153306600
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2154909960 !ruby/object:Gem::Requirement
+  requirement: &2153306100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154909960
+  version_requirements: *2153306100
 description: An easy to use, powerful, and flexible framework for building prototypes
   and production code on any kind of device.
 email:
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2248147296894698664
+      hash: -4548788144942681149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2248147296894698664
+      hash: -4548788144942681149
 requirements: []
 rubyforge_project: foundation
 rubygems_version: 1.6.2