Merge remote-tracking branch 'upstream/master'

Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem "jammit", "~> 0.6.5"

README.markdown

@@ -5,7 +5,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.zip  
+Download:      http://foundation.zurb.com/files/foundation-download-2.1.4.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).
 
@@ -31,16 +31,34 @@ If Foundation knocks your socks off the way we hope it does and you want more, w
 Community
 =========
 
-Many thanks to all the people working on implementations of Foundation for their favorite framework. If want to get on this list send an email to foundation@zurb.com.
+Many thanks to all the people working on Foundation either to improve the base code or to support specific frameworks. If you want to get on this readme send an email to foundation@zurb.com, and if you have questions you can join the Unofficial Foundation Google Group here: http://groups.google.com/group/foundation-framework-
 
 WordPress
 
 * [Starter Theme](https://github.com/drewsymo/Foundation) by Drew Morris
 * [Optional install for roots](https://github.com/retlehs/roots) by Corey Wagehoft
 
+Drupal
+
+* [Drupal Theme](https://github.com/drewkennelly/foundation7) by Drew Kennelly
+
+MODX
+
+* [MODX Version](http://designfromwithin.com/blog/2012/02/07/foundation-modx/) by Menno Pietersen
+
 .NET
 
-* [NuGet Package for ASP.Net MVC](http://nuget.org/List/Packages/Zurb_Foundation_MPC3) by Edward Charbeneau
+* [NuGet Package for ASP.Net MVC](http://nuget.org/List/Packages/Zurb_Foundation_MPC3) by Edward Charbeneau, @EdCharbeneau
+
+Other Implementations
+
+* [Mobile First](https://github.com/admfrhd/mobile-first-foundation) by Adam Fairhead
+* [Less Version](https://github.com/justinmarsan/FoundationLess) by Justin Marsan
+* [Less with Color Scheme](https://github.com/matalin/FoundationLess) by Matalin Hatchard
+
+Editors
+
+* [Textmate/Sublime Text2 Bundle](https://github.com/liamr/Zurb-Foundation-Textmate-Bundle) by Liam R, @liamr
 
 MIT Open Source License
 =======================

build.rb

@@ -1,6 +1,7 @@
-# Creates a zip file of the Foundation template and the compessed assets
+#!/usr/bin/env ruby
+# Creates a zip file of the Foundation template and the compressed assets
 
-VERSION_STRING = '2.1.1'
+VERSION_STRING = '2.1.5'
 
 def prepend_text(file_name, text)
   `exec 3<> '#{file_name}' && awk -v TEXT="#{text}" 'BEGIN {print TEXT}{print}' '#{file_name}' >&3`
@@ -14,6 +15,8 @@ def prepend_text(file_name, text)
 `cp stylesheets/ie.css public/src/stylesheets/ie.css`
 `cp stylesheets/app.css public/src/stylesheets/app.css`
 `cp javascripts/app.js public/src/javascripts/app.js`
+`cp javascripts/modernizr.foundation.js public/src/javascripts/modernizr.foundation.js`
+`cp javascripts/jquery.min.js public/src/javascripts/jquery.min.js`
 
 File.open('public/src/stylesheets/foundation.css', "w") do |file|  
   %w{stylesheets/globals.css stylesheets/typography.css stylesheets/grid.css stylesheets/ui.css stylesheets/forms.css stylesheets/orbit.css stylesheets/reveal.css stylesheets/mobile.css}.each do |stylesheet|
@@ -35,5 +38,5 @@ def prepend_text(file_name, text)
   prepend_text(file_name, "/* Foundation v#{VERSION_STRING} http://foundation.zurb.com */")
 end
 
-`cd public/src && zip -r ../../marketing/files/foundation-download.zip *`
-`rm -rf public`
+`cd public/src && zip -r ../../marketing/files/foundation-download-#{VERSION_STRING}.zip *`
+`rm -rf public`

config/assets.yml

@@ -3,9 +3,8 @@ gzip_assets: off
 
 javascripts:
   foundation:
-    - javascripts/jquery.min.js
     - javascripts/jquery.reveal.js
-    - javascripts/jquery.orbit-1.3.0.js
-    - javascripts/forms.jquery.js
+    - javascripts/jquery.orbit-1.4.0.js
     - javascripts/jquery.customforms.js
-    - javascripts/jquery.placeholder.min.js
+    - javascripts/jquery.placeholder.min.js
+    - javascripts/jquery.tooltips.js

index.html

@@ -7,10 +7,10 @@
 <!--[if gt IE 8]><!--> <html 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 -->
@@ -30,7 +30,7 @@
 		<link rel="stylesheet" href="stylesheets/ie.css">
 	<![endif]-->
 
-	
+
 	<!-- IE Fix for HTML5 Tags -->
 	<!--[if lt IE 9]>
 		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -41,20 +41,19 @@
 
 	<!-- container -->
 	<div class="container">
-		
+
 		<div class="row">
 			<div class="twelve columns">
 				<h2>Welcome to Foundation</h2>
-				<p>This is version 2.1 released on November 18, 2011</p>
-
+				<p>This is version 2.1.5 released on January 26, 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">
@@ -92,26 +91,26 @@ <h3>The Grid</h3>
 						</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>
@@ -121,7 +120,7 @@ <h3>Buttons</h3>
 			<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">
@@ -131,23 +130,24 @@ <h4>Other Resources</h4>
 				</ul>
 			</div>
 		</div>
-		
+
 	</div>
 	<!-- container -->
-	
-	
+
+
 
 
 	<!-- Included JS Files -->
-	<!-- Combine and Compress These 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.3.0.js"></script>
-	<script src="javascripts/forms.jquery.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>
 </html>

javascripts/app.js

@@ -1,48 +1,94 @@
-$(document).ready(function() {
+$(document).ready(function () {
 
 	/* Use this js doc for all application specific JS */
 
 	/* TABS --------------------------------- */
 	/* Remove if you don't need :) */
-
-	var tabs = $('dl.tabs');
-		tabsContent = $('ul.tabs-content')
-
-	tabs.each(function(i) {
+
+	function activateTab($tab) {
+		var $activeTab = $tab.closest('dl').find('a.active'),
+				contentLocation = $tab.attr("href") + 'Tab';
+
+		//Make Tab Active
+		$activeTab.removeClass('active');
+		$tab.addClass('active');
+
+    	//Show Tab Content
+		$(contentLocation).closest('.tabs-content').children('li').hide();
+		$(contentLocation).css('display', 'block');
+	}
+
+	$('dl.tabs').each(function () {
 		//Get all tabs
-		var tab = $(this).children('dd').children('a');
-		tab.click(function(e) {
-
-			//Get Location of tab's content
-			var contentLocation = $(this).attr("href")
-			contentLocation = contentLocation + "Tab";
-
-			//Let go if not a hashed one
-			if(contentLocation.charAt(0)=="#") {
-
-				e.preventDefault();
-
-				//Make Tab Active
-				tab.removeClass('active');
-				$(this).addClass('active');
-
-				//Show Tab Content
-				$(contentLocation).parent('.tabs-content').children('li').css({"display":"none"});
-				$(contentLocation).css({"display":"block"});
-
-			} 
+		var tabs = $(this).children('dd').children('a');
+		tabs.click(function (e) {
+			activateTab($(this));
 		});
 	});
-
-
+
+	if (window.location.hash) {
+		activateTab($('a[href="' + window.location.hash + '"]'));
+	}
+
+	/* ALERT BOXES ------------ */
+	$(".alert-box").delegate("a.close", "click", function(event) {
+    event.preventDefault();
+	  $(this).closest(".alert-box").fadeOut(function(event){
+	    $(this).remove();
+	  });
+	});
+
+
 	/* PLACEHOLDER FOR FORMS ------------- */
 	/* Remove this and jquery.placeholder.min.js if you don't need :) */
-	
+
 	$('input, textarea').placeholder();
-
-
+
+	/* TOOLTIPS ------------ */
+	$(this).tooltips();
+
+
+
+	/* 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 lockNavBar = false;
+	$('.nav-bar a.flyout-toggle').live('click', function(e) {
+		e.preventDefault();
+		var flyout = $(this).siblings('.flyout');
+		if (lockNavBar === false) {
+			$('.nav-bar .flyout').not(flyout).slideUp(500);
+			flyout.slideToggle(500, function(){
+				lockNavBar = false;
+			});
+		}
+		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; */
-	
-	
-});
+  
+
+});