Merge branch 'master' of github.com:zurb/foundation

foundation · Jan 27, 2012 · 1644202 · 1644202
2 parents 0850ab4 + e6610aa
commit 1644202
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 101 deletions.
diff --git a/build.rb b/build.rb
@@ -16,6 +16,7 @@ def prepend_text(file_name, text)
 `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|

diff --git a/config/assets.yml b/config/assets.yml
@@ -3,7 +3,6 @@ gzip_assets: off
 
 javascripts:
   foundation:
-    - javascripts/jquery.min.js
     - javascripts/jquery.reveal.js
     - javascripts/jquery.orbit-1.4.0.js
     - javascripts/jquery.customforms.js

diff --git a/index.html b/index.html
@@ -45,7 +45,7 @@
 		<div class="row">
 			<div class="twelve columns">
 				<h2>Welcome to Foundation</h2>
-				<p>This is version 2.1.4 released on December 19, 2011</p>
+				<p>This is version 2.1.5 released on January 26, 2012</p>
 				<hr />
 			</div>
 		</div>
@@ -145,6 +145,7 @@ <h4>Other Resources</h4>
 	<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>
 

diff --git a/marketing/docs/includes/_documentation_head.php b/marketing/docs/includes/_documentation_head.php
@@ -1,4 +1,4 @@
-<? $version = "2.1.4"; ?>
+<? $version = "2.1.5"; ?>
 <!DOCTYPE html>	
 
 <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->

diff --git a/marketing/docs/ui.php b/marketing/docs/ui.php
@@ -64,14 +64,14 @@
 				<p>Labels are useful inline styles that can be dropped into body copy to call out certain sections or to attach metadata. Examples might be noting when something was updated or that something is new. The syntax is simple, just a <code>span</code> element with a class of .label. The border styling mirrors that of the Foundation buttons.</p>
 
 				<div class="row">
-					<div class="three columns phone-one">
+					<div class="three columns phone-two">
 						<p>
 							<span class="label">Regular Label</span><br /><br />
 							<span class="radius label">Radius Label</span><br /><br />
 							<span class="round label">Round Label</span>
 						</p>
 					</div>
-					<div class="three columns phone-one">
+					<div class="three columns phone-two">
 						<p>
 							<span class="blue radius label">Blue Label</span><br /><br />
 							<span class="red radius label">Red Label</span><br /><br />
@@ -80,11 +80,10 @@
 							<span class="white radius label">White Label</span>
 						</p>
 					</div>
-					<div class="six columns phone-two">
-						<p><span class="radius label">Added 01/19</span> This paragraph has an inline label to let you know that it was added on January 19, 2012 courtesy of Thomas Klemm. Thanks man!</p>
-					</div>
 				</div>
 
+				<p><span class="radius label">Added 01/19</span> This paragraph has an inline label to let you know that it was added on January 19, 2012 courtesy of Thomas Klemm. Thanks man!</p>
+
 				<p><script type="text/javascript" src="http://snipt.net/embed/eabd94fbda853d866057cbda5e8ab64a"></script></p>
 
 				<hr />
@@ -365,7 +364,7 @@
 						<div class="flex-video">
 							<iframe width="420" height="315" src="http://www.youtube.com/embed/9otNWTHOJi8" frameborder="0" allowfullscreen></iframe>
 						</div>
-						4:3 is the default size for the .video element, and the assumption for .video for chrome (controls) height is based on YouTube.
+						4:3 is the default size for the .flex-video element, and the assumption for .flex-video for chrome (controls) height is based on YouTube.
 					</li>
 					<li id="video2Tab">
 						<div class="flex-video widescreen">

diff --git a/marketing/files/foundation-download-2.1.4.zip b/marketing/files/foundation-download-2.1.4.zip
diff --git a/marketing/files/foundation-download-2.1.5.zip b/marketing/files/foundation-download-2.1.5.zip
diff --git a/marketing/includes/_header.php b/marketing/includes/_header.php
@@ -1,4 +1,4 @@
-<? $version = "2.1.4"; ?>
+<? $version = "2.1.5"; ?>
 <!DOCTYPE html>	
 
 <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->

diff --git a/marketing/index.php b/marketing/index.php
@@ -43,7 +43,7 @@
           </article>
           <aside class="three columns">
             <a href="docs/">View the Documentation &raquo;</a>
-            <a href="files/foundation-download-<?= $version ?>.zip">Download Foundation 2.1.4 <!-- <span id="latestVersion">...</span> -->&raquo;</a>
+            <a href="files/foundation-download-<?= $version ?>.zip">Download Foundation <?= $version ?> <!-- <span id="latestVersion">...</span> -->&raquo;</a>
           </aside>
         </div>
 	    </section>

diff --git a/stylesheets/mobile.css b/stylesheets/mobile.css
@@ -215,5 +215,5 @@
 	/* Video */
 
 	@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; }
+		.flex-video { padding-top: 0; }
 	}
diff --git a/stylesheets/ui.css b/stylesheets/ui.css
@@ -214,7 +214,7 @@
 
 	.nav-bar { height: 45px; background: #fff; margin-top: 20px; border: 1px solid #ddd; }	
 	.nav-bar>li { float: left; display: block; position: relative; padding: 0; margin: 0; border-right: 1px solid #ddd; line-height: 45px; }
-	.nav-bar>li>a.main { position: relative; font-size: 14px; padding: 0 20px; display: block; text-decoration: none; font-size: 15px; font-size: 1.5rem; }
+	.nav-bar>li>a.main { position: relative; padding: 0 20px; display: block; text-decoration: none; font-size: 15px; font-size: 1.5rem; }
 	.nav-bar>li>input { margin: 0 16px; }
 	.nav-bar>li ul { margin-bottom: 0; }
 	.nav-bar>li li { line-height: 1.3; }

diff --git a/tooltip.html b/tooltip.html