From 4e99ef00b1e83881398a4453358cbe98cd2233eb Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 7 Apr 2011 12:42:47 -0600
Subject: [PATCH 01/18] setting version to 3.1.1

---
 README.md | 11 +++++++++++
 style.css |  4 +---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 38b3d2f..291a21c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,17 @@
 
 ## Changelog:
 
+### 3.1.1: April 7th, 2011
+
+<ul>
+	<li>Fixed relative path function to work correctly when WordPress is installed in a subdirectory</li>
+	<li>Updated jQuery to 1.5.2</li>
+	<li>Fixed comments to show avatars correctly</li>
+</ul>
+
+#### Contributors
+[Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
+
 ### 3.1.0: April 1st, 2011
 
 <ul>
diff --git a/style.css b/style.css
index 37c38b3..21bd749 100644
--- a/style.css
+++ b/style.css
@@ -2,13 +2,11 @@
 Theme Name:         Roots
 Theme URI:          http://www.rootstheme.com/
 Description:        Starting theme based on HTML5 Boilerplate, Blueprint CSS and Starkers
-Version:            3.1.0
+Version:            3.1.1
 Author:             Ben Word
 Author URI:         http://benword.com/
 Tags:               roots, boilerplate, blueprint, starkers
 
 License:            The Unlicense
 License URI:        http://unlicense.org/
-
-Updated:            April 1 2011
 */
\ No newline at end of file

From 1a1b5d79434a8d2367a0a049b8857b894ce1bc46 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Fri, 15 Apr 2011 11:05:27 -0600
Subject: [PATCH 02/18] adding support for the 1140px grid

---
 README.md                  |  10 +
 css/1140/1140.css          | 130 +++++++
 css/1140/ie.css            |  43 ++
 css/style.css              |  18 +-
 footer.php                 |  12 +-
 functions.php              |  51 ++-
 header.php                 |  23 +-
 includes/roots-options.php |   3 +-
 js/css3-mediaqueries.js    | 779 +++++++++++++++++++++++++++++++++++++
 9 files changed, 1031 insertions(+), 38 deletions(-)
 create mode 100644 css/1140/1140.css
 create mode 100644 css/1140/ie.css
 create mode 100644 js/css3-mediaqueries.js

diff --git a/README.md b/README.md
index 291a21c..6e0b807 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,16 @@
 
 ## Changelog:
 
+### 3.2.0: April 15th, 2011
+
+<ul>
+	<li>Added support for the 1140px Grid</li>
+	<li>Updated the conditional comment code to match latest changes to HTML5 Boilerplate</li>
+</ul>
+
+#### Contributors
+[John Liuti](http://twitter.com/JohnLiuti)
+
 ### 3.1.1: April 7th, 2011
 
 <ul>
diff --git a/css/1140/1140.css b/css/1140/1140.css
new file mode 100644
index 0000000..b8d6fa2
--- /dev/null
+++ b/css/1140/1140.css
@@ -0,0 +1,130 @@
+/* CSS Resets */
+
+html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,address,cite,code,del,dfn,em,img,ins,q,small,strong,sub,sup,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;margin:0;padding:0}article,aside,figure,figure img,figcaption,hgroup,footer,header,nav,section,video,object{display:block}a img{border:0}figure{position:relative}figure img{width:100%}
+
+
+/* ==================================================================================================================== */
+/* ! The 1140px Grid V2 by Andy Taylor \ http://cssgrid.net \ http://www.twitter.com/andytlr \ http://www.andytlr.com   */
+/* ==================================================================================================================== */
+
+.container {
+padding-left: 20px;
+padding-right: 20px;
+}
+
+.row {
+width: 100%;
+max-width: 1140px;
+min-width: 755px;
+margin: 0 auto;
+overflow: hidden;
+}
+
+.onecol, .twocol, .threecol, .fourcol, .fivecol, .sixcol, .sevencol, .eightcol, .ninecol, .tencol, .elevencol {
+margin-right: 3.8%;
+float: left;
+min-height: 1px;
+}
+
+.row .onecol {
+width: 4.85%;
+}
+
+.row .twocol {
+width: 13.45%;
+}
+
+.row .threecol {
+width: 22.05%;
+}
+
+.row .fourcol {
+width: 30.75%;
+}
+
+.row .fivecol {
+width: 39.45%;
+}
+
+.row .sixcol {
+width: 48%;
+}
+
+.row .sevencol {
+width: 56.75%;
+}
+
+.row .eightcol {
+width: 65.4%;
+}
+
+.row .ninecol {
+width: 74.05%;
+}
+
+.row .tencol {
+width: 82.7%;
+}
+
+.row .elevencol {
+width: 91.35%;
+}
+
+.row .twelvecol {
+width: 100%;
+float: left;
+}
+
+.last {
+margin-right: 0px;
+}
+
+img, object, embed {
+max-width: 100%;
+}
+
+img {
+	height: auto;
+}
+
+
+/* Smaller screens */
+
+@media only screen and (max-width: 1023px) {
+
+	body {
+	font-size: 0.8em;
+	line-height: 1.5em;
+	}
+	
+	}
+
+
+/* Mobile */
+
+@media handheld, only screen and (max-width: 767px) {
+
+	body {
+	font-size: 16px;
+	-webkit-text-size-adjust: none;
+	}
+	
+	.row, body, .container {
+	width: 100%;
+	min-width: 0;
+	margin-left: 0px;
+	margin-right: 0px;
+	padding-left: 0px;
+	padding-right: 0px;
+	}
+	
+	.row .onecol, .row .twocol, .row .threecol, .row .fourcol, .row .fivecol, .row .sixcol, .row .sevencol, .row .eightcol, .row .ninecol, .row .tencol, .row .elevencol, .row .twelvecol {
+	width: auto;
+	float: none;
+	margin-left: 0px;
+	margin-right: 0px;
+	padding-left: 20px;
+	padding-right: 20px;
+	}
+
+}
\ No newline at end of file
diff --git a/css/1140/ie.css b/css/1140/ie.css
new file mode 100644
index 0000000..530c113
--- /dev/null
+++ b/css/1140/ie.css
@@ -0,0 +1,43 @@
+.onecol {
+width: 4.7%;
+}
+
+.twocol {
+width: 13.2%;
+}
+
+.threecol {
+width: 22.05%;
+}
+
+.fourcol {
+width: 30.6%;
+}
+
+.fivecol {
+width: 39%;
+}
+
+.sixcol {
+width: 48%;
+}
+
+.sevencol {
+width: 56.75%;
+}
+
+.eightcol {
+width: 61.6%;
+}
+
+.ninecol {
+width: 74.05%;
+}
+
+.tencol {
+width: 82%;
+}
+
+.elevencol {
+width: 91.35%;
+}
\ No newline at end of file
diff --git a/css/style.css b/css/style.css
index e176317..60f57bb 100644
--- a/css/style.css
+++ b/css/style.css
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------------------------------------------------------------------------- */
 /* Typography */
 html { overflow-y: scroll; }
-body { background: #fff; }
+body { background: #fff; font-family: sans-serif; }
 
 a { color: #06c; }
 a:hover, a:focus { color:#09f; }
@@ -58,10 +58,8 @@ a:link { -webkit-tap-highlight-color: #3399FF; }
 }
 
 /* Forms */
-input, select, textarea { font-family: sans-serif; font-size: 1em; }
-button, input, select, textarea { margin: 0; }
+button, input, select, textarea { width: auto; overflow: visible; margin: 0; font-family: sans-serif; font-size: 1em; }
 label, input[type=button], input[type=submit], button { cursor: pointer; }
-button { width: auto; overflow: visible; }
 textarea { overflow: auto; }
 
 /* Grid */
@@ -70,7 +68,8 @@ textarea { overflow: auto; }
 
 /* HEADER
 --------------------------------------------------------------------------------------------------------------------------------------------------- */
-#banner { position: relative; margin: 16px auto; z-index: 1000; }
+#banner { position: relative; margin: 16px auto 0; z-index: 1000; }
+#banner .container { padding: 0; }
 
 #logo { float: left; width: 300px; height: 75px; margin: 0 0 16px; padding: 0; }
 
@@ -82,7 +81,7 @@ textarea { overflow: auto; }
 	background-image: linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1));	
 	position: relative; 
 	list-style: none; 
-	margin: 0; 
+	margin: 0 0 16px 0; 
 	padding: 0;
 	float: left; 
 	width: 100%;
@@ -150,9 +149,10 @@ textarea { overflow: auto; }
 /* CONTENT
 --------------------------------------------------------------------------------------------------------------------------------------------------- */
 #content { margin-bottom: 24px; }
-#content .container { width: auto; position: relative; }
+#content .container { width: auto; position: relative; padding: 0; }
 
 #main { position: relative; }
+#main .container { padding: 0; }
 
 /* Posts */
 .hentry header { margin-bottom: 1.5em; }
@@ -202,7 +202,7 @@ figure.gallery-item figcaption { display: none; }
 
 /* Primary Sidebar */
 #sidebar { position: relative; }
-#sidebar .container { width: auto; }
+#sidebar .container { width: auto; padding: 0; }
 #sidebar .widget { clear: both; margin-bottom: 1.5em; }
 #sidebar .widget .gform_wrapper ul { padding: 0; list-style-type: none; }
 
@@ -210,7 +210,7 @@ figure.gallery-item figcaption { display: none; }
 /* FOOTER
 --------------------------------------------------------------------------------------------------------------------------------------------------- */
 #content-info { clear: both; position: relative; }
-#content-info > .container { padding-bottom: 1.5em; }
+#content-info > .container { padding: 0 0 1.5em; }
 
 #content-info ul.menu { margin: 0 0 24px; padding: 0; list-style-type: none; }
 #content-info ul.menu li { display: inline; margin-right: 1em; }
diff --git a/footer.php b/footer.php
index 27677bd..1798a20 100644
--- a/footer.php
+++ b/footer.php
@@ -1,3 +1,7 @@
+	<?php if (get_option('roots_css_framework') === '1140') { ?>
+		</div><!-- /.row -->
+		<div class="row">
+	<?php } ?>		
 		<footer id="content-info" class="<?php echo roots_container_class; ?>" role="contentinfo">
 			<div class="container">
 				<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar("Footer") ) : ?>
@@ -23,10 +27,12 @@
 					<a class="email" href="mailto:<?php echo get_option('roots_vcard_email'); ?>"><?php echo get_option('roots_vcard_email'); ?></a>
 				</p>
 				<?php } ?>
-				
-			</div>
+			</div>	
 		</footer>
+	<?php if (get_option('roots_css_framework') === '1140') { ?>
+		</div><!-- /.row -->
+	<?php } ?>		
 	</div><!-- /#wrap -->
 <?php wp_footer(); ?>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index c411f1c..0e1234e 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-//get active theme directory name (lets you rename roots)
+// get active theme directory name (lets you rename roots)
 $theme_name = next(explode('/themes/', get_template_directory()));
 
 include_once('includes/roots-activation.php');	// activation
@@ -16,39 +16,36 @@ if (!defined('roots_container_class')) {
 	switch ($roots_css_framework) {
 		case 'blueprint':
 			define('roots_container_class', 'span-24');
-			define('is_960gs', false);
 		case '960gs_12':
 			define('roots_container_class', 'container_12');
-			define('is_960gs', true);
-			define('is_960gs_12', true);
 		case '960gs_16':
 			define('roots_container_class', 'container_16');
-			define('is_960gs', true);
-			define('is_960gs_16', true);
 		case '960gs_24':
 			define('roots_container_class', 'container_24');
-			define('is_960gs', true);
-			define('is_960gs_24', true);
+		case '1140':
+			define('roots_container_class', 'container');
 		default:
 			define('roots_container_class', '');
-			define('is_960gs', false);
 	}
 }
 
-function get_roots_css_framework_stylesheets() {
+function get_roots_stylesheets() {
+  $roots_css_framework = get_option('roots_css_framework');
 	$css_uri = get_stylesheet_directory_uri();
 	$styles = '';
 
-	if (!is_960gs) {
+	if ($roots_css_framework === 'blueprint') {
 		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/screen.css\">\n";
-	} elseif (is_960gs_12 == 1 || is_960gs_16 == 1) {
+	} elseif ($roots_css_framework === '960gs_12' || $roots_css_framework === '960gs_16') {
 		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/960/reset.css\">\n";
 		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/text.css\">\n";
 		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/960.css\">\n";
-	} elseif (is_960gs_24 == 1) {
+	} elseif ($roots_css_framework === '960gs_24') {
 		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/960/reset.css\">\n";
 		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/text.css\">\n";
 		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/960_24_col.css\">\n";
+	} elseif ($roots_css_framework === '1140') {
+		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/1140/1140.css\">\n";
 	}
 
 	if (class_exists('RGForms')) {
@@ -57,16 +54,32 @@ function get_roots_css_framework_stylesheets() {
 
 	$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/style.css\">\n";
 
-	if (!is_960gs) {
-		$styles .= "\t<!--[if lt IE 8]>i<link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/ie.css\"><![endif]-->\n";
+	if ($roots_css_framework === 'blueprint') {
+		$styles .= "\t<!--[if lt IE 8]><link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/ie.css\"><![endif]-->\n";
+	} elseif ($roots_css_framework === '1140') {
+		$styles .= "\t<!--[if lt IE 8]><link rel=\"stylesheet\" href=\"$css_uri/css/1140/ie.css\"><![endif]-->\n";
 	}
 
-  return $styles;
+	return $styles;
 }
 	
-// set the maximum 'Large' image width to the Blueprint grid maximum width
-if (!isset($content_width)) $roots_selected_css_framework === 'blueprint' ? $content_width = 950 : $content_width = 940;
-
+// set the maximum 'Large' image width to the maximum grid width
+if (!isset($content_width)) {
+  switch ($roots_css_framework) {
+    case 'blueprint' :
+		$content_width = 950;
+    case '960gs_12' :
+		$content_width = 940;
+    case '960gs_16' :
+		$content_width = 940;
+    case '960gs_24' :
+		$content_width = 940;
+    case '1140' :
+		$content_width = 1140;
+    default :
+		$content_width = 950;
+  }
+}
 // tell the TinyMCE editor to use editor-style.css
 // if you have issues with getting the editor to show your changes then use the following line:
 // add_editor_style('editor-style.css?' . time());
diff --git a/header.php b/header.php
index 85fa247..5c69c52 100644
--- a/header.php
+++ b/header.php
@@ -1,8 +1,8 @@
 <!doctype html>
-<!--[if lt IE 7 ]> <html class="no-js ie6" lang="en"> <![endif]-->
-<!--[if IE 7 ]>    <html class="no-js ie7" lang="en"> <![endif]-->
-<!--[if IE 8 ]>    <html class="no-js ie8" lang="en"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
+<!--[if lt IE 7]> <html class="no-js ie6" lang="en"> <![endif]-->
+<!--[if IE 7]>    <html class="no-js ie7" lang="en"> <![endif]-->
+<!--[if IE 8]>    <html class="no-js ie8" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <head>
 	<meta charset="utf-8">
 
@@ -10,7 +10,7 @@
 	
 	<meta name="viewport" content="width=device-width; initial-scale=1.0">
 
-	<?php echo get_roots_css_framework_stylesheets(); ?>
+	<?php echo get_roots_stylesheets(); ?>
 	
 	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php site_url(); ?>/feed/">
 
@@ -19,7 +19,9 @@
 	<script>window.jQuery || document.write("<script src='<?php echo get_stylesheet_directory_uri(); ?>/js/libs/jquery-1.5.2.min.js'>\x3C/script>")</script>
 
 	<?php wp_head(); ?>
-
+<?php if (get_option('roots_css_framework') === '1140') { ?>
+	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/css3-mediaqueries.js"></script>
+<?php } ?>	
 	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/scripts.js"></script>
 <?php if (get_option('roots_google_analytics') !== "") { ?>
 	<script>
@@ -32,6 +34,9 @@
 </head>
 <body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
 	<div id="wrap" class="container" role="document">
+	<?php if (get_option('roots_css_framework') === '1140') { ?>
+		<div class="row">
+	<?php } ?>	
 		<header id="banner" class="<?php echo roots_container_class; ?>" role="banner">
 			<div class="container">
 				<a id="logo" href="<?php site_url(); ?>/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
@@ -43,3 +48,9 @@
 				</nav>				
 			</div>
 		</header>
+	<?php if (get_option('roots_css_framework') === '1140') { ?>
+		</div><!-- /.row -->
+	<?php } ?>
+	<?php if (get_option('roots_css_framework') === '1140') { ?>
+		<div class="row">
+	<?php } ?>
diff --git a/includes/roots-options.php b/includes/roots-options.php
index 3721b8c..930f54d 100644
--- a/includes/roots-options.php
+++ b/includes/roots-options.php
@@ -84,7 +84,8 @@ function roots_settings_page() { ?>
 							<input id="roots_blueprint" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === 'blueprint' ? 'checked' : ''; ?> value="blueprint" /> <label for="roots_blueprint">Blueprint CSS</label><br />
 							<input id="roots_960gs_12" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_12' ? 'checked' : ''; ?> value="960gs_12" /> <label for="roots_960gs_12">960gs (12 cols)</label><br />
 							<input id="roots_960gs_16" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_16' ? 'checked' : ''; ?> value="960gs_16" /> <label for="roots_960gs_16">960gs (16 cols)</label><br />
-							<input id="roots_960gs_24" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_24' ? 'checked' : ''; ?> value="960gs_24" /> <label for="roots_960gs_24">960gs (24 cols)</label>
+							<input id="roots_960gs_24" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_24' ? 'checked' : ''; ?> value="960gs_24" /> <label for="roots_960gs_24">960gs (24 cols)</label><br />
+							<input id="roots_1140" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '1140' ? 'checked' : ''; ?> value="1140" /> <label for="roots_1140">1140</label>
 						</div>
 					</li>
 					<li>	
diff --git a/js/css3-mediaqueries.js b/js/css3-mediaqueries.js
new file mode 100644
index 0000000..76bc260
--- /dev/null
+++ b/js/css3-mediaqueries.js
@@ -0,0 +1,779 @@
+if(typeof Object.create!=="function"){
+Object.create=function(o){
+function F(){
+};
+F.prototype=o;
+return new F();
+};
+}
+var ua={toString:function(){
+return navigator.userAgent;
+},test:function(s){
+return this.toString().toLowerCase().indexOf(s.toLowerCase())>-1;
+}};
+ua.version=(ua.toString().toLowerCase().match(/[\s\S]+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1];
+ua.webkit=ua.test("webkit");
+ua.gecko=ua.test("gecko")&&!ua.webkit;
+ua.opera=ua.test("opera");
+ua.ie=ua.test("msie")&&!ua.opera;
+ua.ie6=ua.ie&&document.compatMode&&typeof document.documentElement.style.maxHeight==="undefined";
+ua.ie7=ua.ie&&document.documentElement&&typeof document.documentElement.style.maxHeight!=="undefined"&&typeof XDomainRequest==="undefined";
+ua.ie8=ua.ie&&typeof XDomainRequest!=="undefined";
+var domReady=function(){
+var _1=[];
+var _2=function(){
+if(!arguments.callee.done){
+arguments.callee.done=true;
+for(var i=0;i<_1.length;i++){
+_1[i]();
+}
+}
+};
+if(document.addEventListener){
+document.addEventListener("DOMContentLoaded",_2,false);
+}
+if(ua.ie){
+(function(){
+try{
+document.documentElement.doScroll("left");
+}
+catch(e){
+setTimeout(arguments.callee,50);
+return;
+}
+_2();
+})();
+document.onreadystatechange=function(){
+if(document.readyState==="complete"){
+document.onreadystatechange=null;
+_2();
+}
+};
+}
+if(ua.webkit&&document.readyState){
+(function(){
+if(document.readyState!=="loading"){
+_2();
+}else{
+setTimeout(arguments.callee,10);
+}
+})();
+}
+window.onload=_2;
+return function(fn){
+if(typeof fn==="function"){
+_1[_1.length]=fn;
+}
+return fn;
+};
+}();
+var cssHelper=function(){
+var _3={BLOCKS:/[^\s{][^{]*\{(?:[^{}]*\{[^{}]*\}[^{}]*|[^{}]*)*\}/g,BLOCKS_INSIDE:/[^\s{][^{]*\{[^{}]*\}/g,DECLARATIONS:/[a-zA-Z\-]+[^;]*:[^;]+;/g,RELATIVE_URLS:/url\(['"]?([^\/\)'"][^:\)'"]+)['"]?\)/g,REDUNDANT_COMPONENTS:/(?:\/\*([^*\\\\]|\*(?!\/))+\*\/|@import[^;]+;)/g,REDUNDANT_WHITESPACE:/\s*(,|:|;|\{|\})\s*/g,MORE_WHITESPACE:/\s{2,}/g,FINAL_SEMICOLONS:/;\}/g,NOT_WHITESPACE:/\S+/g};
+var _4,_5=false;
+var _6=[];
+var _7=function(fn){
+if(typeof fn==="function"){
+_6[_6.length]=fn;
+}
+};
+var _8=function(){
+for(var i=0;i<_6.length;i++){
+_6[i](_4);
+}
+};
+var _9={};
+var _a=function(n,v){
+if(_9[n]){
+var _b=_9[n].listeners;
+if(_b){
+for(var i=0;i<_b.length;i++){
+_b[i](v);
+}
+}
+}
+};
+var _c=function(_d,_e,_f){
+if(ua.ie&&!window.XMLHttpRequest){
+window.XMLHttpRequest=function(){
+return new ActiveXObject("Microsoft.XMLHTTP");
+};
+}
+if(!XMLHttpRequest){
+return "";
+}
+var r=new XMLHttpRequest();
+try{
+r.open("get",_d,true);
+r.setRequestHeader("X_REQUESTED_WITH","XMLHttpRequest");
+}
+catch(e){
+_f();
+return;
+}
+var _10=false;
+setTimeout(function(){
+_10=true;
+},5000);
+document.documentElement.style.cursor="progress";
+r.onreadystatechange=function(){
+if(r.readyState===4&&!_10){
+if(!r.status&&location.protocol==="file:"||(r.status>=200&&r.status<300)||r.status===304||navigator.userAgent.indexOf("Safari")>-1&&typeof r.status==="undefined"){
+_e(r.responseText);
+}else{
+_f();
+}
+document.documentElement.style.cursor="";
+r=null;
+}
+};
+r.send("");
+};
+var _11=function(_12){
+_12=_12.replace(_3.REDUNDANT_COMPONENTS,"");
+_12=_12.replace(_3.REDUNDANT_WHITESPACE,"$1");
+_12=_12.replace(_3.MORE_WHITESPACE," ");
+_12=_12.replace(_3.FINAL_SEMICOLONS,"}");
+return _12;
+};
+var _13={mediaQueryList:function(s){
+var o={};
+var idx=s.indexOf("{");
+var lt=s.substring(0,idx);
+s=s.substring(idx+1,s.length-1);
+var mqs=[],rs=[];
+var qts=lt.toLowerCase().substring(7).split(",");
+for(var i=0;i<qts.length;i++){
+mqs[mqs.length]=_13.mediaQuery(qts[i],o);
+}
+var rts=s.match(_3.BLOCKS_INSIDE);
+if(rts!==null){
+for(i=0;i<rts.length;i++){
+rs[rs.length]=_13.rule(rts[i],o);
+}
+}
+o.getMediaQueries=function(){
+return mqs;
+};
+o.getRules=function(){
+return rs;
+};
+o.getListText=function(){
+return lt;
+};
+o.getCssText=function(){
+return s;
+};
+return o;
+},mediaQuery:function(s,mql){
+s=s||"";
+var not=false,_14;
+var exp=[];
+var _15=true;
+var _16=s.match(_3.NOT_WHITESPACE);
+for(var i=0;i<_16.length;i++){
+var _17=_16[i];
+if(!_14&&(_17==="not"||_17==="only")){
+if(_17==="not"){
+not=true;
+}
+}else{
+if(!_14){
+_14=_17;
+}else{
+if(_17.charAt(0)==="("){
+var _18=_17.substring(1,_17.length-1).split(":");
+exp[exp.length]={mediaFeature:_18[0],value:_18[1]||null};
+}
+}
+}
+}
+return {getList:function(){
+return mql||null;
+},getValid:function(){
+return _15;
+},getNot:function(){
+return not;
+},getMediaType:function(){
+return _14;
+},getExpressions:function(){
+return exp;
+}};
+},rule:function(s,mql){
+var o={};
+var idx=s.indexOf("{");
+var st=s.substring(0,idx);
+var ss=st.split(",");
+var ds=[];
+var dts=s.substring(idx+1,s.length-1).split(";");
+for(var i=0;i<dts.length;i++){
+ds[ds.length]=_13.declaration(dts[i],o);
+}
+o.getMediaQueryList=function(){
+return mql||null;
+};
+o.getSelectors=function(){
+return ss;
+};
+o.getSelectorText=function(){
+return st;
+};
+o.getDeclarations=function(){
+return ds;
+};
+o.getPropertyValue=function(n){
+for(var i=0;i<ds.length;i++){
+if(ds[i].getProperty()===n){
+return ds[i].getValue();
+}
+}
+return null;
+};
+return o;
+},declaration:function(s,r){
+var idx=s.indexOf(":");
+var p=s.substring(0,idx);
+var v=s.substring(idx+1);
+return {getRule:function(){
+return r||null;
+},getProperty:function(){
+return p;
+},getValue:function(){
+return v;
+}};
+}};
+var _19=function(el){
+if(typeof el.cssHelperText!=="string"){
+return;
+}
+var o={mediaQueryLists:[],rules:[],selectors:{},declarations:[],properties:{}};
+var _1a=o.mediaQueryLists;
+var ors=o.rules;
+var _1b=el.cssHelperText.match(_3.BLOCKS);
+if(_1b!==null){
+for(var i=0;i<_1b.length;i++){
+if(_1b[i].substring(0,7)==="@media "){
+_1a[_1a.length]=_13.mediaQueryList(_1b[i]);
+ors=o.rules=ors.concat(_1a[_1a.length-1].getRules());
+}else{
+ors[ors.length]=_13.rule(_1b[i]);
+}
+}
+}
+var oss=o.selectors;
+var _1c=function(r){
+var ss=r.getSelectors();
+for(var i=0;i<ss.length;i++){
+var n=ss[i];
+if(!oss[n]){
+oss[n]=[];
+}
+oss[n][oss[n].length]=r;
+}
+};
+for(i=0;i<ors.length;i++){
+_1c(ors[i]);
+}
+var ods=o.declarations;
+for(i=0;i<ors.length;i++){
+ods=o.declarations=ods.concat(ors[i].getDeclarations());
+}
+var ops=o.properties;
+for(i=0;i<ods.length;i++){
+var n=ods[i].getProperty();
+if(!ops[n]){
+ops[n]=[];
+}
+ops[n][ops[n].length]=ods[i];
+}
+el.cssHelperParsed=o;
+_4[_4.length]=el;
+return o;
+};
+var _1d=function(el,s){
+el.cssHelperText=_11(s||el.innerHTML);
+return _19(el);
+};
+var _1e=function(){
+_5=true;
+_4=[];
+var _1f=[];
+var _20=function(){
+for(var i=0;i<_1f.length;i++){
+_19(_1f[i]);
+}
+var _21=document.getElementsByTagName("style");
+for(i=0;i<_21.length;i++){
+_1d(_21[i]);
+}
+_5=false;
+_8();
+};
+var _22=document.getElementsByTagName("link");
+for(var i=0;i<_22.length;i++){
+var _23=_22[i];
+if(_23.getAttribute("rel").indexOf("style")>-1&&_23.href&&_23.href.length!==0&&!_23.disabled){
+_1f[_1f.length]=_23;
+}
+}
+if(_1f.length>0){
+var c=0;
+var _24=function(){
+c++;
+if(c===_1f.length){
+_20();
+}
+};
+var _25=function(_26){
+var _27=_26.href;
+_c(_27,function(_28){
+_28=_11(_28).replace(_3.RELATIVE_URLS,"url("+_27.substring(0,_27.lastIndexOf("/"))+"/$1)");
+_26.cssHelperText=_28;
+_24();
+},_24);
+};
+for(i=0;i<_1f.length;i++){
+_25(_1f[i]);
+}
+}else{
+_20();
+}
+};
+var _29={mediaQueryLists:"array",rules:"array",selectors:"object",declarations:"array",properties:"object"};
+var _2a={mediaQueryLists:null,rules:null,selectors:null,declarations:null,properties:null};
+var _2b=function(_2c,v){
+if(_2a[_2c]!==null){
+if(_29[_2c]==="array"){
+return (_2a[_2c]=_2a[_2c].concat(v));
+}else{
+var c=_2a[_2c];
+for(var n in v){
+if(v.hasOwnProperty(n)){
+if(!c[n]){
+c[n]=v[n];
+}else{
+c[n]=c[n].concat(v[n]);
+}
+}
+}
+return c;
+}
+}
+};
+var _2d=function(_2e){
+_2a[_2e]=(_29[_2e]==="array")?[]:{};
+for(var i=0;i<_4.length;i++){
+_2b(_2e,_4[i].cssHelperParsed[_2e]);
+}
+return _2a[_2e];
+};
+domReady(function(){
+var els=document.body.getElementsByTagName("*");
+for(var i=0;i<els.length;i++){
+els[i].checkedByCssHelper=true;
+}
+if(document.implementation.hasFeature("MutationEvents","2.0")||window.MutationEvent){
+document.body.addEventListener("DOMNodeInserted",function(e){
+var el=e.target;
+if(el.nodeType===1){
+_a("DOMElementInserted",el);
+el.checkedByCssHelper=true;
+}
+},false);
+}else{
+setInterval(function(){
+var els=document.body.getElementsByTagName("*");
+for(var i=0;i<els.length;i++){
+if(!els[i].checkedByCssHelper){
+_a("DOMElementInserted",els[i]);
+els[i].checkedByCssHelper=true;
+}
+}
+},1000);
+}
+});
+var _2f=function(d){
+if(typeof window.innerWidth!="undefined"){
+return window["inner"+d];
+}else{
+if(typeof document.documentElement!="undefined"&&typeof document.documentElement.clientWidth!="undefined"&&document.documentElement.clientWidth!=0){
+return document.documentElement["client"+d];
+}
+}
+};
+return {addStyle:function(s,_30){
+var el=document.createElement("style");
+el.setAttribute("type","text/css");
+document.getElementsByTagName("head")[0].appendChild(el);
+if(el.styleSheet){
+el.styleSheet.cssText=s;
+}else{
+el.appendChild(document.createTextNode(s));
+}
+el.addedWithCssHelper=true;
+if(typeof _30==="undefined"||_30===true){
+cssHelper.parsed(function(_31){
+var o=_1d(el,s);
+for(var n in o){
+if(o.hasOwnProperty(n)){
+_2b(n,o[n]);
+}
+}
+_a("newStyleParsed",el);
+});
+}else{
+el.parsingDisallowed=true;
+}
+return el;
+},removeStyle:function(el){
+return el.parentNode.removeChild(el);
+},parsed:function(fn){
+if(_5){
+_7(fn);
+}else{
+if(typeof _4!=="undefined"){
+if(typeof fn==="function"){
+fn(_4);
+}
+}else{
+_7(fn);
+_1e();
+}
+}
+},mediaQueryLists:function(fn){
+cssHelper.parsed(function(_32){
+fn(_2a.mediaQueryLists||_2d("mediaQueryLists"));
+});
+},rules:function(fn){
+cssHelper.parsed(function(_33){
+fn(_2a.rules||_2d("rules"));
+});
+},selectors:function(fn){
+cssHelper.parsed(function(_34){
+fn(_2a.selectors||_2d("selectors"));
+});
+},declarations:function(fn){
+cssHelper.parsed(function(_35){
+fn(_2a.declarations||_2d("declarations"));
+});
+},properties:function(fn){
+cssHelper.parsed(function(_36){
+fn(_2a.properties||_2d("properties"));
+});
+},broadcast:_a,addListener:function(n,fn){
+if(typeof fn==="function"){
+if(!_9[n]){
+_9[n]={listeners:[]};
+}
+_9[n].listeners[_9[n].listeners.length]=fn;
+}
+},removeListener:function(n,fn){
+if(typeof fn==="function"&&_9[n]){
+var ls=_9[n].listeners;
+for(var i=0;i<ls.length;i++){
+if(ls[i]===fn){
+ls.splice(i,1);
+i-=1;
+}
+}
+}
+},getViewportWidth:function(){
+return _2f("Width");
+},getViewportHeight:function(){
+return _2f("Height");
+}};
+}();
+domReady(function enableCssMediaQueries(){
+var _37;
+var _38={LENGTH_UNIT:/[0-9]+(em|ex|px|in|cm|mm|pt|pc)$/,RESOLUTION_UNIT:/[0-9]+(dpi|dpcm)$/,ASPECT_RATIO:/^[0-9]+\/[0-9]+$/,ABSOLUTE_VALUE:/^[0-9]*(\.[0-9]+)*$/};
+var _39=[];
+var _3a=function(){
+var id="css3-mediaqueries-test";
+var el=document.createElement("div");
+el.id=id;
+var _3b=cssHelper.addStyle("@media all and (width) { #"+id+" { width: 1px !important; } }",false);
+document.body.appendChild(el);
+var ret=el.offsetWidth===1;
+_3b.parentNode.removeChild(_3b);
+el.parentNode.removeChild(el);
+_3a=function(){
+return ret;
+};
+return ret;
+};
+var _3c=function(){
+_37=document.createElement("div");
+_37.style.cssText="position:absolute;top:-9999em;left:-9999em;"+"margin:0;border:none;padding:0;width:1em;font-size:1em;";
+document.body.appendChild(_37);
+if(_37.offsetWidth!==16){
+_37.style.fontSize=16/_37.offsetWidth+"em";
+}
+_37.style.width="";
+};
+var _3d=function(_3e){
+_37.style.width=_3e;
+var _3f=_37.offsetWidth;
+_37.style.width="";
+return _3f;
+};
+var _40=function(_41,_42){
+var l=_41.length;
+var min=(_41.substring(0,4)==="min-");
+var max=(!min&&_41.substring(0,4)==="max-");
+if(_42!==null){
+var _43;
+var _44;
+if(_38.LENGTH_UNIT.exec(_42)){
+_43="length";
+_44=_3d(_42);
+}else{
+if(_38.RESOLUTION_UNIT.exec(_42)){
+_43="resolution";
+_44=parseInt(_42,10);
+var _45=_42.substring((_44+"").length);
+}else{
+if(_38.ASPECT_RATIO.exec(_42)){
+_43="aspect-ratio";
+_44=_42.split("/");
+}else{
+if(_38.ABSOLUTE_VALUE){
+_43="absolute";
+_44=_42;
+}else{
+_43="unknown";
+}
+}
+}
+}
+}
+var _46,_47;
+if("device-width"===_41.substring(l-12,l)){
+_46=screen.width;
+if(_42!==null){
+if(_43==="length"){
+return ((min&&_46>=_44)||(max&&_46<_44)||(!min&&!max&&_46===_44));
+}else{
+return false;
+}
+}else{
+return _46>0;
+}
+}else{
+if("device-height"===_41.substring(l-13,l)){
+_47=screen.height;
+if(_42!==null){
+if(_43==="length"){
+return ((min&&_47>=_44)||(max&&_47<_44)||(!min&&!max&&_47===_44));
+}else{
+return false;
+}
+}else{
+return _47>0;
+}
+}else{
+if("width"===_41.substring(l-5,l)){
+_46=document.documentElement.clientWidth||document.body.clientWidth;
+if(_42!==null){
+if(_43==="length"){
+return ((min&&_46>=_44)||(max&&_46<_44)||(!min&&!max&&_46===_44));
+}else{
+return false;
+}
+}else{
+return _46>0;
+}
+}else{
+if("height"===_41.substring(l-6,l)){
+_47=document.documentElement.clientHeight||document.body.clientHeight;
+if(_42!==null){
+if(_43==="length"){
+return ((min&&_47>=_44)||(max&&_47<_44)||(!min&&!max&&_47===_44));
+}else{
+return false;
+}
+}else{
+return _47>0;
+}
+}else{
+if("device-aspect-ratio"===_41.substring(l-19,l)){
+return _43==="aspect-ratio"&&screen.width*_44[1]===screen.height*_44[0];
+}else{
+if("color-index"===_41.substring(l-11,l)){
+var _48=Math.pow(2,screen.colorDepth);
+if(_42!==null){
+if(_43==="absolute"){
+return ((min&&_48>=_44)||(max&&_48<_44)||(!min&&!max&&_48===_44));
+}else{
+return false;
+}
+}else{
+return _48>0;
+}
+}else{
+if("color"===_41.substring(l-5,l)){
+var _49=screen.colorDepth;
+if(_42!==null){
+if(_43==="absolute"){
+return ((min&&_49>=_44)||(max&&_49<_44)||(!min&&!max&&_49===_44));
+}else{
+return false;
+}
+}else{
+return _49>0;
+}
+}else{
+if("resolution"===_41.substring(l-10,l)){
+var res;
+if(_45==="dpcm"){
+res=_3d("1cm");
+}else{
+res=_3d("1in");
+}
+if(_42!==null){
+if(_43==="resolution"){
+return ((min&&res>=_44)||(max&&res<_44)||(!min&&!max&&res===_44));
+}else{
+return false;
+}
+}else{
+return res>0;
+}
+}else{
+return false;
+}
+}
+}
+}
+}
+}
+}
+}
+};
+var _4a=function(mq){
+var _4b=mq.getValid();
+var _4c=mq.getExpressions();
+var l=_4c.length;
+if(l>0){
+for(var i=0;i<l&&_4b;i++){
+_4b=_40(_4c[i].mediaFeature,_4c[i].value);
+}
+var not=mq.getNot();
+return (_4b&&!not||not&&!_4b);
+}
+};
+var _4d=function(mql){
+var mqs=mql.getMediaQueries();
+var t={};
+for(var i=0;i<mqs.length;i++){
+if(_4a(mqs[i])){
+t[mqs[i].getMediaType()]=true;
+}
+}
+var s=[],c=0;
+for(var n in t){
+if(t.hasOwnProperty(n)){
+if(c>0){
+s[c++]=",";
+}
+s[c++]=n;
+}
+}
+if(s.length>0){
+_39[_39.length]=cssHelper.addStyle("@media "+s.join("")+"{"+mql.getCssText()+"}",false);
+}
+};
+var _4e=function(_4f){
+for(var i=0;i<_4f.length;i++){
+_4d(_4f[i]);
+}
+if(ua.ie){
+document.documentElement.style.display="block";
+setTimeout(function(){
+document.documentElement.style.display="";
+},0);
+setTimeout(function(){
+cssHelper.broadcast("cssMediaQueriesTested");
+},100);
+}else{
+cssHelper.broadcast("cssMediaQueriesTested");
+}
+};
+var _50=function(){
+for(var i=0;i<_39.length;i++){
+cssHelper.removeStyle(_39[i]);
+}
+_39=[];
+cssHelper.mediaQueryLists(_4e);
+};
+var _51=0;
+var _52=function(){
+var _53=cssHelper.getViewportWidth();
+var _54=cssHelper.getViewportHeight();
+if(ua.ie){
+var el=document.createElement("div");
+el.style.position="absolute";
+el.style.top="-9999em";
+el.style.overflow="scroll";
+document.body.appendChild(el);
+_51=el.offsetWidth-el.clientWidth;
+document.body.removeChild(el);
+}
+var _55;
+var _56=function(){
+var vpw=cssHelper.getViewportWidth();
+var vph=cssHelper.getViewportHeight();
+if(Math.abs(vpw-_53)>_51||Math.abs(vph-_54)>_51){
+_53=vpw;
+_54=vph;
+clearTimeout(_55);
+_55=setTimeout(function(){
+if(!_3a()){
+_50();
+}else{
+cssHelper.broadcast("cssMediaQueriesTested");
+}
+},500);
+}
+};
+window.onresize=function(){
+var x=window.onresize||function(){
+};
+return function(){
+x();
+_56();
+};
+}();
+};
+var _57=document.documentElement;
+_57.style.marginLeft="-32767px";
+setTimeout(function(){
+_57.style.marginTop="";
+},20000);
+return function(){
+if(!_3a()){
+cssHelper.addListener("newStyleParsed",function(el){
+_4e(el.cssHelperParsed.mediaQueryLists);
+});
+cssHelper.addListener("cssMediaQueriesTested",function(){
+if(ua.ie){
+_57.style.width="1px";
+}
+setTimeout(function(){
+_57.style.width="";
+_57.style.marginLeft="";
+},0);
+cssHelper.removeListener("cssMediaQueriesTested",arguments.callee);
+});
+_3c();
+_50();
+}else{
+_57.style.marginLeft="";
+}
+_52();
+};
+}());
+try{
+document.execCommand("BackgroundImageCache",false,true);
+}
+catch(e){
+}
+

From 533c3bbc85b6e8cfaa1260d57501ed9f2f4ae8f5 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Wed, 20 Apr 2011 10:14:36 -0600
Subject: [PATCH 03/18] support for child theme - fixes #18

---
 includes/roots-cleanup.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index 5e1e2ec..ac70229 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -1,5 +1,9 @@
 <?php
 
+$theme_name = next(explode('/themes/', get_stylesheet_directory()));
+$theme_data = get_theme_data(ABSPATH . 'wp-content/themes/' . $theme_name . '/style.css');
+
+// Rewrites DO NOT happen for child themes
 // rewrite /wp-content/themes/roots/css/ to /css/
 // rewrite /wp-content/themes/roots/js/  to /js/
 // rewrite /wp-content/themes/roots/img/ to /js/
@@ -11,7 +15,7 @@ function roots_flush_rewrites() {
 }
 
 function roots_add_rewrites($content) {
-  $theme_name = next(explode('/themes/', get_template_directory()));
+  $theme_name = next(explode('/themes/', get_stylesheet_directory()));
 	global $wp_rewrite;
 	$roots_new_non_wp_rules = array(
 		'css/(.*)'      => 'wp-content/themes/'. $theme_name . '/css/$1',
@@ -22,7 +26,6 @@ function roots_add_rewrites($content) {
 	$wp_rewrite->non_wp_rules += $roots_new_non_wp_rules;
 }
 
-add_action('generate_rewrite_rules', 'roots_add_rewrites');
 add_action('admin_init', 'roots_flush_rewrites');
 
 function roots_clean_assets($content) {
@@ -32,8 +35,6 @@ function roots_clean_assets($content) {
     $content = str_replace($current_path, $new_path, $content);
     return $content;
 }
-add_filter('bloginfo', 'roots_clean_assets');
-add_filter('stylesheet_directory_uri', 'roots_clean_assets');
 
 function roots_clean_plugins($content) {
     $current_path = '/wp-content/plugins';
@@ -41,7 +42,14 @@ function roots_clean_plugins($content) {
     $content = str_replace($current_path, $new_path, $content);
     return $content;
 }
-add_filter('plugins_url', 'roots_clean_plugins');
+
+// only use clean urls if the theme isn't a child
+if ($theme_data['Template'] === '') {
+  add_action('generate_rewrite_rules', 'roots_add_rewrites');
+  add_filter('plugins_url', 'roots_clean_plugins');
+  add_filter('bloginfo', 'roots_clean_assets');
+  add_filter('stylesheet_directory_uri', 'roots_clean_assets');
+}
 
 // redirect /?s to /search/
 // http://txfx.net/wordpress-plugins/nice-search/

From e938859ac792a77cc7065fbc4cfe785156deae19 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Wed, 20 Apr 2011 10:32:11 -0600
Subject: [PATCH 04/18] adding support for child themes

---
 README.md | 8 +++++++-
 style.css | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6e0b807..301a5f7 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,12 @@
 
 ## Changelog:
 
+### 3.2.1: April 20th, 2011
+
+<ul>
+  <li>Added support for child themes</li>
+</ul>
+
 ### 3.2.0: April 15th, 2011
 
 <ul>
@@ -140,4 +146,4 @@ Everything else:
 
 ## Summary:
 
-Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS and Starkers that will help you rapidly create brochure sites and blogs.
\ No newline at end of file
+Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS and Starkers that will help you rapidly create brochure sites and blogs.
diff --git a/style.css b/style.css
index 21bd749..9facdec 100644
--- a/style.css
+++ b/style.css
@@ -2,11 +2,11 @@
 Theme Name:         Roots
 Theme URI:          http://www.rootstheme.com/
 Description:        Starting theme based on HTML5 Boilerplate, Blueprint CSS and Starkers
-Version:            3.1.1
+Version:            3.2.1
 Author:             Ben Word
 Author URI:         http://benword.com/
 Tags:               roots, boilerplate, blueprint, starkers
 
 License:            The Unlicense
 License URI:        http://unlicense.org/
-*/
\ No newline at end of file
+*/

From d54f3e64faf456c282329af1c8a120d3e3cc73b2 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Fri, 22 Apr 2011 20:15:52 -0600
Subject: [PATCH 05/18] Changed site_url to home_url - fixes #34

---
 header.php                 | 4 ++--
 includes/roots-admin.php   | 8 ++++----
 includes/roots-options.php | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/header.php b/header.php
index 5c69c52..78e92d8 100644
--- a/header.php
+++ b/header.php
@@ -12,7 +12,7 @@
 
 	<?php echo get_roots_stylesheets(); ?>
 	
-	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php site_url(); ?>/feed/">
+	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php echo home_url(); ?>/feed/">
 
 	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/libs/modernizr-1.7.min.js"></script>
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
@@ -39,7 +39,7 @@
 	<?php } ?>	
 		<header id="banner" class="<?php echo roots_container_class; ?>" role="banner">
 			<div class="container">
-				<a id="logo" href="<?php site_url(); ?>/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
+				<a id="logo" href="<?php echo home_url(); ?>/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
 				<nav id="nav-main" class="<?php echo roots_container_class; ?>" role="navigation">
 					<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
 				</nav>
diff --git a/includes/roots-admin.php b/includes/roots-admin.php
index 6cfed7e..979df69 100644
--- a/includes/roots-admin.php
+++ b/includes/roots-admin.php
@@ -4,16 +4,16 @@
 add_action('admin_init', 'roots_admin_init');
 
 function roots_admin_init() {
-	$site_url = site_url();
+	$home_url = home_url();
 	$theme_name = next(explode('/themes/', get_template_directory()));
 	
-	//wp_register_script('roots_codemirror', "$site_url/wp-content/themes/roots/includes/js/codemirror/codemirror.js");
+	//wp_register_script('roots_codemirror', "$home_url/wp-content/themes/roots/includes/js/codemirror/codemirror.js");
 	//wp_enqueue_script('roots_codemirror');
 
-	wp_register_style('roots_admin_css', "$site_url/wp-content/themes/$theme_name/includes/css/admin.css");
+	wp_register_style('roots_admin_css', "$home_url/wp-content/themes/$theme_name/includes/css/admin.css");
 	wp_enqueue_style('roots_admin_css');
 	
-	wp_register_script('roots_admin_js', "$site_url/wp-content/themes/$theme_name/includes/js/scripts.js");
+	wp_register_script('roots_admin_js', "$home_url/wp-content/themes/$theme_name/includes/js/scripts.js");
 	wp_enqueue_script('roots_admin_js');
 
 }
diff --git a/includes/roots-options.php b/includes/roots-options.php
index 930f54d..97a08de 100644
--- a/includes/roots-options.php
+++ b/includes/roots-options.php
@@ -21,13 +21,13 @@ function roots_create_menu() {
 }
 
 function roots_admin_styles() {
-	$site_url = site_url();
+	$home_url = home_url();
 	$theme_name = next(explode('/themes/', get_template_directory()));
 
-	wp_register_style('roots_options_css', "$site_url/wp-content/themes/$theme_name/includes/css/options.css");
+	wp_register_style('roots_options_css', "$home_url/wp-content/themes/$theme_name/includes/css/options.css");
 	wp_enqueue_style('roots_options_css');
 	
-	wp_register_script('roots_options_js', "$site_url/wp-content/themes/$theme_name/includes/js/options.js");
+	wp_register_script('roots_options_js', "$home_url/wp-content/themes/$theme_name/includes/js/options.js");
 	wp_enqueue_script('roots_options_js');	
 
 	wp_register_style('jquery-ui-css', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/themes/smoothness/jquery-ui.css");

From 6bc3a6bcf361769ff252bfe9ba073f07735decc0 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Fri, 22 Apr 2011 20:30:08 -0600
Subject: [PATCH 06/18] Replaced get_stylesheet with get_template in many
 places to better accommodate child themes #18

---
 functions.php | 24 ++++++++++++------------
 header.php    | 10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/functions.php b/functions.php
index 0e1234e..e207edf 100644
--- a/functions.php
+++ b/functions.php
@@ -31,33 +31,33 @@ if (!defined('roots_container_class')) {
 
 function get_roots_stylesheets() {
   $roots_css_framework = get_option('roots_css_framework');
-	$css_uri = get_stylesheet_directory_uri();
+	$template_uri = get_template_directory_uri();
 	$styles = '';
 
 	if ($roots_css_framework === 'blueprint') {
-		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/screen.css\">\n";
+		$styles .= "<link rel=\"stylesheet\" href=\"$template_uri/css/blueprint/screen.css\">\n";
 	} elseif ($roots_css_framework === '960gs_12' || $roots_css_framework === '960gs_16') {
-		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/960/reset.css\">\n";
-		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/text.css\">\n";
-		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/960.css\">\n";
+		$styles .= "<link rel=\"stylesheet\" href=\"$template_uri/css/960/reset.css\">\n";
+		$styles .= "\t<link rel=\"stylesheet\" href=\"$template_uri/css/960/text.css\">\n";
+		$styles .= "\t<link rel=\"stylesheet\" href=\"$template_uri/css/960/960.css\">\n";
 	} elseif ($roots_css_framework === '960gs_24') {
-		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/960/reset.css\">\n";
-		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/text.css\">\n";
-		$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/960/960_24_col.css\">\n";
+		$styles .= "<link rel=\"stylesheet\" href=\"$template_uri/css/960/reset.css\">\n";
+		$styles .= "\t<link rel=\"stylesheet\" href=\"$template_uri/css/960/text.css\">\n";
+		$styles .= "\t<link rel=\"stylesheet\" href=\"$template_uri/css/960/960_24_col.css\">\n";
 	} elseif ($roots_css_framework === '1140') {
-		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/1140/1140.css\">\n";
+		$styles .= "<link rel=\"stylesheet\" href=\"$template_uri/css/1140/1140.css\">\n";
 	}
 
 	if (class_exists('RGForms')) {
 		$styles .= "\t<link rel=\"stylesheet\" href=\"" . plugins_url(). "/gravityforms/css/forms.css\">\n";
 	}
 
-	$styles .= "\t<link rel=\"stylesheet\" href=\"$css_uri/css/style.css\">\n";
+	$styles .= "\t<link rel=\"stylesheet\" href=\"$template_uri/css/style.css\">\n";
 
 	if ($roots_css_framework === 'blueprint') {
-		$styles .= "\t<!--[if lt IE 8]><link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/ie.css\"><![endif]-->\n";
+		$styles .= "\t<!--[if lt IE 8]><link rel=\"stylesheet\" href=\"$template_uri/css/blueprint/ie.css\"><![endif]-->\n";
 	} elseif ($roots_css_framework === '1140') {
-		$styles .= "\t<!--[if lt IE 8]><link rel=\"stylesheet\" href=\"$css_uri/css/1140/ie.css\"><![endif]-->\n";
+		$styles .= "\t<!--[if lt IE 8]><link rel=\"stylesheet\" href=\"$template_uri/css/1140/ie.css\"><![endif]-->\n";
 	}
 
 	return $styles;
diff --git a/header.php b/header.php
index 78e92d8..578a51c 100644
--- a/header.php
+++ b/header.php
@@ -14,15 +14,15 @@
 	
 	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php echo home_url(); ?>/feed/">
 
-	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/libs/modernizr-1.7.min.js"></script>
+	<script src="<?php echo get_template_directory_uri(); ?>/js/libs/modernizr-1.7.min.js"></script>
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
-	<script>window.jQuery || document.write("<script src='<?php echo get_stylesheet_directory_uri(); ?>/js/libs/jquery-1.5.2.min.js'>\x3C/script>")</script>
+	<script>window.jQuery || document.write("<script src='<?php echo get_template_directory_uri(); ?>/js/libs/jquery-1.5.2.min.js'>\x3C/script>")</script>
 
 	<?php wp_head(); ?>
 <?php if (get_option('roots_css_framework') === '1140') { ?>
-	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/css3-mediaqueries.js"></script>
+	<script src="<?php echo get_template_directory_uri(); ?>/js/css3-mediaqueries.js"></script>
 <?php } ?>	
-	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/scripts.js"></script>
+	<script src="<?php echo get_template_directory_uri(); ?>/js/scripts.js"></script>
 <?php if (get_option('roots_google_analytics') !== "") { ?>
 	<script>
 		var _gaq=[["_setAccount","<?php echo get_option('roots_google_analytics') ?>"],["_trackPageview"]];
@@ -39,7 +39,7 @@
 	<?php } ?>	
 		<header id="banner" class="<?php echo roots_container_class; ?>" role="banner">
 			<div class="container">
-				<a id="logo" href="<?php echo home_url(); ?>/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
+				<a id="logo" href="<?php echo home_url(); ?>/"><img src="<?php echo get_template_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
 				<nav id="nav-main" class="<?php echo roots_container_class; ?>" role="navigation">
 					<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
 				</nav>

From 992a9e92408f9ba3011d471f789f277f6efbab46 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Sat, 23 Apr 2011 11:12:29 -0600
Subject: [PATCH 07/18] Adding break to case statements + consistent formatting
 - fixes #35

---
 functions.php              | 36 ++++++++++++++++++++++++------------
 includes/roots-cleanup.php |  6 +++---
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/functions.php b/functions.php
index e207edf..7348052 100644
--- a/functions.php
+++ b/functions.php
@@ -16,16 +16,22 @@ if (!defined('roots_container_class')) {
 	switch ($roots_css_framework) {
 		case 'blueprint':
 			define('roots_container_class', 'span-24');
+      break;
 		case '960gs_12':
 			define('roots_container_class', 'container_12');
+      break;
 		case '960gs_16':
 			define('roots_container_class', 'container_16');
+      break;
 		case '960gs_24':
 			define('roots_container_class', 'container_24');
+      break;
 		case '1140':
 			define('roots_container_class', 'container');
+      break;
 		default:
 			define('roots_container_class', '');
+      break;
 	}
 }
 
@@ -66,18 +72,24 @@ function get_roots_stylesheets() {
 // set the maximum 'Large' image width to the maximum grid width
 if (!isset($content_width)) {
   switch ($roots_css_framework) {
-    case 'blueprint' :
-		$content_width = 950;
-    case '960gs_12' :
-		$content_width = 940;
-    case '960gs_16' :
-		$content_width = 940;
-    case '960gs_24' :
-		$content_width = 940;
-    case '1140' :
-		$content_width = 1140;
-    default :
-		$content_width = 950;
+    case 'blueprint':
+		  $content_width = 950;
+      break;
+    case '960gs_12':
+		  $content_width = 940;
+      break;
+    case '960gs_16':
+		  $content_width = 940;
+      break;
+    case '960gs_24':
+		  $content_width = 940;
+      break;
+    case '1140':
+		  $content_width = 1140;
+      break;
+    default:
+		  $content_width = 950;
+      break;
   }
 }
 // tell the TinyMCE editor to use editor-style.css
diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index ac70229..b5107d4 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -255,13 +255,13 @@ function roots_gallery_shortcode($attr) {
 		// make the gallery link to the file by default instead of the attachment
 		// thanks to Matt Price (countingrows.com)
 		switch($attr['link']) {
-      case 'file' : 
+      case 'file': 
         $link = wp_get_attachment_link($id, $size, false, false);
         break;
-      case 'attachment' :
+      case 'attachment':
         $link = wp_get_attachment_link($id, $size, true, false);
         break;
-      default :
+      default:
         $link = wp_get_attachment_link($id, $size, false, false);
         break;
 		}

From 164a416741d5c018188c514fe068aab70f4a20ae Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sun, 24 Apr 2011 09:55:26 -0600
Subject: [PATCH 08/18] tagging 3.2.2 (bugfixes)

---
 README.md | 33 +++++++++++++++------------------
 style.css |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 301a5f7..180c0e5 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,15 @@
 
 ## Changelog:
 
+### 3.2.2: April 24th, 2011
+<ul>
+	<li>Bugfixes</li>
+</ul>
+
 ### 3.2.1: April 20th, 2011
 
 <ul>
-  <li>Added support for child themes</li>
+	<li>Added support for child themes</li>
 </ul>
 
 ### 3.2.0: April 15th, 2011
@@ -15,9 +20,6 @@
 	<li>Updated the conditional comment code to match latest changes to HTML5 Boilerplate</li>
 </ul>
 
-#### Contributors
-[John Liuti](http://twitter.com/JohnLiuti)
-
 ### 3.1.1: April 7th, 2011
 
 <ul>
@@ -26,9 +28,6 @@
 	<li>Fixed comments to show avatars correctly</li>
 </ul>
 
-#### Contributors
-[Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
-
 ### 3.1.0: April 1st, 2011
 
 <ul>
@@ -37,9 +36,6 @@
 	<li>Made the theme directory and name renamable</li>
 </ul>
 
-#### Contributors
-[John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/)
-
 ### 3.0.0: March 28th, 2011
 
 <ul>
@@ -61,9 +57,6 @@
 	<li>Updated CSS for Gravity Forms 1.5</li>
 	<li>Added <code>searchform.php template</code></li>
 </ul>
-	
-#### Contributors
-[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen)
 
 ### 2.4.0: January 25th, 2011
 
@@ -130,15 +123,19 @@
 	<li>Added Blueprint CSS to Starkers</li>
 </ul>
 
+## Contributors
+[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen), [John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/), [Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
+
 ## License:
 
 Major components:
 
-* HTML5 Boileplate: [The Unlicense](http://unlicense.org)
+* HTML5 Boilerplate: [The Unlicense](http://unlicense.org)
 * Blueprint CSS: Modified MIT License
-* 960 Grid System: MIT/GPL license
-* Modernizr: MIT/BSD license
-* jQuery: MIT/GPL license
+* 960 Grid System: MIT/GPL License
+* The 1140px Grid: CC BY-SA 3.0 Australia License
+* Modernizr: MIT/BSD License
+* jQuery: MIT/GPL License
 
 Everything else:
 
@@ -146,4 +143,4 @@ Everything else:
 
 ## Summary:
 
-Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS and Starkers that will help you rapidly create brochure sites and blogs.
+Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS (or 960.gs) and Starkers that will help you rapidly create brochure sites and blogs.
diff --git a/style.css b/style.css
index 9facdec..66fc0a1 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 Theme Name:         Roots
 Theme URI:          http://www.rootstheme.com/
 Description:        Starting theme based on HTML5 Boilerplate, Blueprint CSS and Starkers
-Version:            3.2.1
+Version:            3.2.2
 Author:             Ben Word
 Author URI:         http://benword.com/
 Tags:               roots, boilerplate, blueprint, starkers

From a3d351cafe9a9039b89ca7fdd19e54737ec892bb Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Mon, 25 Apr 2011 22:03:58 -0600
Subject: [PATCH 09/18] URL rewriting bug fixes + better MU support

---
 includes/roots-cleanup.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index b5107d4..025311c 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -43,12 +43,13 @@ function roots_clean_plugins($content) {
     return $content;
 }
 
-// only use clean urls if the theme isn't a child
-if ($theme_data['Template'] === '') {
+// only use clean urls if the theme isn't a child or an MU (Network) install
+if ((!defined('WP_ALLOW_MULTISITE') || (defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE !== true)) && $theme_data['Template'] === '') {
   add_action('generate_rewrite_rules', 'roots_add_rewrites');
   add_filter('plugins_url', 'roots_clean_plugins');
   add_filter('bloginfo', 'roots_clean_assets');
   add_filter('stylesheet_directory_uri', 'roots_clean_assets');
+  add_filter('template_directory_uri', 'roots_clean_assets');
 }
 
 // redirect /?s to /search/
@@ -73,6 +74,7 @@ function roots_root_relative_url($input) {
 add_filter('bloginfo_url', 'roots_root_relative_url');
 add_filter('theme_root_uri', 'roots_root_relative_url');
 add_filter('stylesheet_directory_uri', 'roots_root_relative_url');
+add_filter('template_directory_uri', 'roots_root_relative_url');
 add_filter('the_permalink', 'roots_root_relative_url');
 add_filter('wp_list_pages', 'roots_root_relative_url');
 add_filter('wp_list_categories', 'roots_root_relative_url');

From ad5e287ddcef524de05fc5b8b44690cb18bb958a Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sun, 24 Apr 2011 09:55:26 -0600
Subject: [PATCH 10/18] tagging 3.2.2 (bugfixes)

---
 README.md | 33 +++++++++++++++------------------
 style.css |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 301a5f7..180c0e5 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,15 @@
 
 ## Changelog:
 
+### 3.2.2: April 24th, 2011
+<ul>
+	<li>Bugfixes</li>
+</ul>
+
 ### 3.2.1: April 20th, 2011
 
 <ul>
-  <li>Added support for child themes</li>
+	<li>Added support for child themes</li>
 </ul>
 
 ### 3.2.0: April 15th, 2011
@@ -15,9 +20,6 @@
 	<li>Updated the conditional comment code to match latest changes to HTML5 Boilerplate</li>
 </ul>
 
-#### Contributors
-[John Liuti](http://twitter.com/JohnLiuti)
-
 ### 3.1.1: April 7th, 2011
 
 <ul>
@@ -26,9 +28,6 @@
 	<li>Fixed comments to show avatars correctly</li>
 </ul>
 
-#### Contributors
-[Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
-
 ### 3.1.0: April 1st, 2011
 
 <ul>
@@ -37,9 +36,6 @@
 	<li>Made the theme directory and name renamable</li>
 </ul>
 
-#### Contributors
-[John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/)
-
 ### 3.0.0: March 28th, 2011
 
 <ul>
@@ -61,9 +57,6 @@
 	<li>Updated CSS for Gravity Forms 1.5</li>
 	<li>Added <code>searchform.php template</code></li>
 </ul>
-	
-#### Contributors
-[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen)
 
 ### 2.4.0: January 25th, 2011
 
@@ -130,15 +123,19 @@
 	<li>Added Blueprint CSS to Starkers</li>
 </ul>
 
+## Contributors
+[Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen), [John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/), [Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
+
 ## License:
 
 Major components:
 
-* HTML5 Boileplate: [The Unlicense](http://unlicense.org)
+* HTML5 Boilerplate: [The Unlicense](http://unlicense.org)
 * Blueprint CSS: Modified MIT License
-* 960 Grid System: MIT/GPL license
-* Modernizr: MIT/BSD license
-* jQuery: MIT/GPL license
+* 960 Grid System: MIT/GPL License
+* The 1140px Grid: CC BY-SA 3.0 Australia License
+* Modernizr: MIT/BSD License
+* jQuery: MIT/GPL License
 
 Everything else:
 
@@ -146,4 +143,4 @@ Everything else:
 
 ## Summary:
 
-Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS and Starkers that will help you rapidly create brochure sites and blogs.
+Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS (or 960.gs) and Starkers that will help you rapidly create brochure sites and blogs.
diff --git a/style.css b/style.css
index 9facdec..66fc0a1 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 Theme Name:         Roots
 Theme URI:          http://www.rootstheme.com/
 Description:        Starting theme based on HTML5 Boilerplate, Blueprint CSS and Starkers
-Version:            3.2.1
+Version:            3.2.2
 Author:             Ben Word
 Author URI:         http://benword.com/
 Tags:               roots, boilerplate, blueprint, starkers

From edf5b263fb37952b98194aa1cfdc8cbd30147a98 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 28 Apr 2011 13:52:43 -0600
Subject: [PATCH 11/18] fixes #37 -- adding language_attributes() in header.php

---
 header.php                 |  8 ++++----
 includes/roots-cleanup.php | 32 +++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/header.php b/header.php
index 578a51c..bc80a6c 100644
--- a/header.php
+++ b/header.php
@@ -1,8 +1,8 @@
 <!doctype html>
-<!--[if lt IE 7]> <html class="no-js ie6" lang="en"> <![endif]-->
-<!--[if IE 7]>    <html class="no-js ie7" lang="en"> <![endif]-->
-<!--[if IE 8]>    <html class="no-js ie8" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
+<!--[if lt IE 7]> <html class="no-js ie6" <?php language_attributes(); ?>> <![endif]-->
+<!--[if IE 7]>    <html class="no-js ie7" <?php language_attributes(); ?>> <![endif]-->
+<!--[if IE 8]>    <html class="no-js ie8" <?php language_attributes(); ?>> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" <?php language_attributes(); ?>> <!--<![endif]-->
 <head>
 	<meta charset="utf-8">
 
diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index 025311c..b651b39 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -45,11 +45,11 @@ function roots_clean_plugins($content) {
 
 // only use clean urls if the theme isn't a child or an MU (Network) install
 if ((!defined('WP_ALLOW_MULTISITE') || (defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE !== true)) && $theme_data['Template'] === '') {
-  add_action('generate_rewrite_rules', 'roots_add_rewrites');
-  add_filter('plugins_url', 'roots_clean_plugins');
-  add_filter('bloginfo', 'roots_clean_assets');
-  add_filter('stylesheet_directory_uri', 'roots_clean_assets');
-  add_filter('template_directory_uri', 'roots_clean_assets');
+	add_action('generate_rewrite_rules', 'roots_add_rewrites');
+	add_filter('plugins_url', 'roots_clean_plugins');
+	add_filter('bloginfo', 'roots_clean_assets');
+	add_filter('stylesheet_directory_uri', 'roots_clean_assets');
+	add_filter('template_directory_uri', 'roots_clean_assets');
 }
 
 // redirect /?s to /search/
@@ -66,8 +66,8 @@ add_action('template_redirect', 'roots_nice_search_redirect');
 // inspired by http://www.456bereastreet.com/archive/201010/how_to_make_wordpress_urls_root_relative/
 // thanks to Scott Walkinshaw (scottwalkinshaw.com)
 function roots_root_relative_url($input) {
-  preg_match('/(https?:\/\/[^\/]+)/', $input, $matches);
-  return str_replace(end($matches), '', $input);
+	preg_match('/(https?:\/\/[^\/]+)/', $input, $matches);
+	return str_replace(end($matches), '', $input);
 }
 
 //add_filter('site_url', 'roots_root_relative_url'); // this will break URLs sent out in emails, possibly more
@@ -103,6 +103,24 @@ function roots_relative_feed_urls() {
 
 add_action('pre_get_posts', 'roots_relative_feed_urls' );
 
+// remove dir and set lang="en" as default (rather than en-US)
+function roots_language_attributes() {
+        $attributes = array();
+	        $output = '';         
+			if (!defined('WP_LANG')) {
+				$attributes[] = "lang=\"en\"";
+			} else if ($lang = get_bloginfo('language')) {
+	           $attributes[] = "lang=\"$lang\"";
+	        }
+	
+	        $output = implode(' ', $attributes);
+	        $output = apply_filters('roots_language_attributes', $output);
+	        echo $output;    
+}
+
+add_filter('language_attributes', 'roots_language_attributes');
+
+
 // remove WordPress version from RSS feed
 function roots_no_generator() { return ''; }
 add_filter('the_generator', 'roots_no_generator');

From 7cc92802a7cbed768c376a3a67cf83dc8d1f90a5 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 28 Apr 2011 13:55:31 -0600
Subject: [PATCH 12/18] cleaning up formatting from previous commit

---
 includes/roots-cleanup.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index b651b39..4594086 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -105,17 +105,17 @@ add_action('pre_get_posts', 'roots_relative_feed_urls' );
 
 // remove dir and set lang="en" as default (rather than en-US)
 function roots_language_attributes() {
-        $attributes = array();
-	        $output = '';         
-			if (!defined('WP_LANG')) {
-				$attributes[] = "lang=\"en\"";
-			} else if ($lang = get_bloginfo('language')) {
-	           $attributes[] = "lang=\"$lang\"";
-	        }
-	
-	        $output = implode(' ', $attributes);
-	        $output = apply_filters('roots_language_attributes', $output);
-	        echo $output;    
+	$attributes = array();
+	$output = '';
+	if (!defined('WP_LANG')) {
+		$attributes[] = "lang=\"en\"";
+	} else if ($lang = get_bloginfo('language')) {
+		$attributes[] = "lang=\"$lang\"";
+	}
+
+	$output = implode(' ', $attributes);
+	$output = apply_filters('roots_language_attributes', $output);
+	echo $output;
 }
 
 add_filter('language_attributes', 'roots_language_attributes');

From 07dc7b7d81389ded3c2a35e0d3fd79bd05cf94a9 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 28 Apr 2011 21:26:58 -0600
Subject: [PATCH 13/18] adding in the latest changes from h5bp and blueprint
 css

---
 css/blueprint/screen.css    | 8 ++++----
 css/style.css               | 4 +++-
 includes/roots-htaccess.php | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/css/blueprint/screen.css b/css/blueprint/screen.css
index 6d1f6ed..c0253e0 100644
--- a/css/blueprint/screen.css
+++ b/css/blueprint/screen.css
@@ -13,8 +13,8 @@
 
 /* reset.css */
 html {margin:0;padding:0;border:0;}
-body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
-article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
+body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;}
+article, aside, details, figcaption, figure, dialog, footer, header, hgroup, menu, nav, section {display:block;}
 body {line-height:1.5;background:white;}
 table {border-collapse:separate;border-spacing:0;}
 caption, th, td {text-align:left;font-weight:normal;float:none !important;}
@@ -84,7 +84,7 @@ fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
 legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;}
 fieldset, #IE8#HACK {padding-top:1.4em;}
 legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
-input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;color:#000;}
 input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;}
 select {background-color:#fff;border-width:1px;border-style:solid;}
 input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
@@ -257,7 +257,7 @@ input.span-24, textarea.span-24 {width:938px;}
 div.prepend-top, .prepend-top {margin-top:1.5em;}
 div.append-bottom, .append-bottom {margin-bottom:1.5em;}
 .box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;}
-hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 17px;border:none;}
 hr.space {background:#fff;color:#fff;visibility:hidden;}
 .clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
 .clearfix, .container {display:block;}
diff --git a/css/style.css b/css/style.css
index 60f57bb..6e50d28 100644
--- a/css/style.css
+++ b/css/style.css
@@ -59,8 +59,9 @@ a:link { -webkit-tap-highlight-color: #3399FF; }
 
 /* Forms */
 button, input, select, textarea { width: auto; overflow: visible; margin: 0; font-family: sans-serif; font-size: 1em; }
-label, input[type=button], input[type=submit], button { cursor: pointer; }
+label, input[type=button], input[type=submit], input[type=image], button { cursor: pointer; }
 textarea { overflow: auto; }
+input::-moz-focus-inner, button::-moz-focus-inner { border: 0; padding: 0; }
 
 /* Grid */
 #wrap { }
@@ -432,6 +433,7 @@ img.ui-datepicker-trigger { vertical-align: middle; }
   pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
   thead { display: table-header-group; }
   tr, img { page-break-inside: avoid; }
+  img { max-width: 100% !important; }
   @page { margin: 0.5cm; }
   p, h2, h3 { orphans: 3; widows: 3; }
   h2, h3 { page-break-after: avoid; }	
diff --git a/includes/roots-htaccess.php b/includes/roots-htaccess.php
index a2a10bc..ee226b2 100644
--- a/includes/roots-htaccess.php
+++ b/includes/roots-htaccess.php
@@ -108,6 +108,7 @@ function roots_add_htaccess($rules) {
 	$rules .= "\nAddType application/x-chrome-extension crx";
 	$rules .= "\nAddType application/x-xpinstall        xpi";
 	$rules .= "\nAddType application/octet-stream       safariextz";
+	$rules .= "\nAddType text/x-vcard       			vcf";
 	$rules .= "\n";
 	$rules .= "\n";
 	$rules .= "\n";

From e5d81e5d06edd1d7090126599c73b836773c23d6 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Thu, 28 Apr 2011 21:30:17 -0600
Subject: [PATCH 14/18] updating jquery cycle to latest version (2.99)

---
 js/jquery.cycle.lite.min.js | 12 +++++++++++-
 js/jquery.cycle.min.js      |  8 ++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/js/jquery.cycle.lite.min.js b/js/jquery.cycle.lite.min.js
index 22c80ff..25b7dab 100644
--- a/js/jquery.cycle.lite.min.js
+++ b/js/jquery.cycle.lite.min.js
@@ -1 +1,11 @@
-(function(D){var A="Lite-1.0";D.fn.cycle=function(E){return this.each(function(){E=E||{};if(this.cycleTimeout){clearTimeout(this.cycleTimeout)}this.cycleTimeout=0;this.cyclePause=0;var I=D(this);var J=E.slideExpr?D(E.slideExpr,this):I.children();var G=J.get();if(G.length<2){if(window.console&&window.console.log){window.console.log("terminating; too few slides: "+G.length)}return }var H=D.extend({},D.fn.cycle.defaults,E||{},D.metadata?I.metadata():D.meta?I.data():{});H.before=H.before?[H.before]:[];H.after=H.after?[H.after]:[];H.after.unshift(function(){H.busy=0});var F=this.className;H.width=parseInt((F.match(/w:(\d+)/)||[])[1])||H.width;H.height=parseInt((F.match(/h:(\d+)/)||[])[1])||H.height;H.timeout=parseInt((F.match(/t:(\d+)/)||[])[1])||H.timeout;if(I.css("position")=="static"){I.css("position","relative")}if(H.width){I.width(H.width)}if(H.height&&H.height!="auto"){I.height(H.height)}var K=0;J.css({position:"absolute",top:0,left:0}).hide().each(function(M){D(this).css("z-index",G.length-M)});D(G[K]).css("opacity",1).show();if(D.browser.msie){G[K].style.removeAttribute("filter")}if(H.fit&&H.width){J.width(H.width)}if(H.fit&&H.height&&H.height!="auto"){J.height(H.height)}if(H.pause){I.hover(function(){this.cyclePause=1},function(){this.cyclePause=0})}D.fn.cycle.transitions.fade(I,J,H);J.each(function(){var M=D(this);this.cycleH=(H.fit&&H.height)?H.height:M.height();this.cycleW=(H.fit&&H.width)?H.width:M.width()});J.not(":eq("+K+")").css({opacity:0});if(H.cssFirst){D(J[K]).css(H.cssFirst)}if(H.timeout){if(H.speed.constructor==String){H.speed={slow:600,fast:200}[H.speed]||400}if(!H.sync){H.speed=H.speed/2}while((H.timeout-H.speed)<250){H.timeout+=H.speed}}H.speedIn=H.speed;H.speedOut=H.speed;H.slideCount=G.length;H.currSlide=K;H.nextSlide=1;var L=J[K];if(H.before.length){H.before[0].apply(L,[L,L,H,true])}if(H.after.length>1){H.after[1].apply(L,[L,L,H,true])}if(H.click&&!H.next){H.next=H.click}if(H.next){D(H.next).bind("click",function(){return C(G,H,H.rev?-1:1)})}if(H.prev){D(H.prev).bind("click",function(){return C(G,H,H.rev?1:-1)})}if(H.timeout){this.cycleTimeout=setTimeout(function(){B(G,H,0,!H.rev)},H.timeout+(H.delay||0))}})};function B(J,E,I,K){if(E.busy){return }var H=J[0].parentNode,M=J[E.currSlide],L=J[E.nextSlide];if(H.cycleTimeout===0&&!I){return }if(I||!H.cyclePause){if(E.before.length){D.each(E.before,function(N,O){O.apply(L,[M,L,E,K])})}var F=function(){if(D.browser.msie){this.style.removeAttribute("filter")}D.each(E.after,function(N,O){O.apply(L,[M,L,E,K])})};if(E.nextSlide!=E.currSlide){E.busy=1;D.fn.cycle.custom(M,L,E,F)}var G=(E.nextSlide+1)==J.length;E.nextSlide=G?0:E.nextSlide+1;E.currSlide=G?J.length-1:E.nextSlide-1}if(E.timeout){H.cycleTimeout=setTimeout(function(){B(J,E,0,!E.rev)},E.timeout)}}function C(E,F,I){var H=E[0].parentNode,G=H.cycleTimeout;if(G){clearTimeout(G);H.cycleTimeout=0}F.nextSlide=F.currSlide+I;if(F.nextSlide<0){F.nextSlide=E.length-1}else{if(F.nextSlide>=E.length){F.nextSlide=0}}B(E,F,1,I>=0);return false}D.fn.cycle.custom=function(K,H,I,E){var J=D(K),G=D(H);G.css({opacity:0});var F=function(){G.animate({opacity:1},I.speedIn,I.easeIn,E)};J.animate({opacity:0},I.speedOut,I.easeOut,function(){J.css({display:"none"});if(!I.sync){F()}});if(I.sync){F()}};D.fn.cycle.transitions={fade:function(F,G,E){G.not(":eq(0)").css("opacity",0);E.before.push(function(){D(this).show()})}};D.fn.cycle.ver=function(){return A};D.fn.cycle.defaults={timeout:4000,speed:1000,next:null,prev:null,before:null,after:null,height:"auto",sync:1,fit:0,pause:0,delay:0,slideExpr:null}})(jQuery)
\ No newline at end of file
+/*
+ * jQuery Cycle Lite Plugin
+ * http://malsup.com/jquery/cycle/lite/
+ * Copyright (c) 2008-2011 M. Alsup
+ * Version: 1.1 (03/07/2011)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ * Requires: jQuery v1.3.2 or later
+ */
+;(function($){var ver="Lite-1.1";$.fn.cycle=function(options){return this.each(function(){options=options||{};if(this.cycleTimeout){clearTimeout(this.cycleTimeout);}this.cycleTimeout=0;this.cyclePause=0;var $cont=$(this);var $slides=options.slideExpr?$(options.slideExpr,this):$cont.children();var els=$slides.get();if(els.length<2){window.console&&console.log("terminating; too few slides: "+els.length);return ;}var opts=$.extend({},$.fn.cycle.defaults,options||{},$.metadata?$cont.metadata():$.meta?$cont.data():{});opts.before=opts.before?[opts.before]:[];opts.after=opts.after?[opts.after]:[];opts.after.unshift(function(){opts.busy=0;});var cls=this.className;opts.width=parseInt((cls.match(/w:(\d+)/)||[])[1])||opts.width;opts.height=parseInt((cls.match(/h:(\d+)/)||[])[1])||opts.height;opts.timeout=parseInt((cls.match(/t:(\d+)/)||[])[1])||opts.timeout;if($cont.css("position")=="static"){$cont.css("position","relative");}if(opts.width){$cont.width(opts.width);}if(opts.height&&opts.height!="auto"){$cont.height(opts.height);}var first=0;$slides.css({position:"absolute",top:0,left:0}).each(function(i){$(this).css("z-index",els.length-i);});$(els[first]).css("opacity",1).show();if($.browser.msie){els[first].style.removeAttribute("filter");}if(opts.fit&&opts.width){$slides.width(opts.width);}if(opts.fit&&opts.height&&opts.height!="auto"){$slides.height(opts.height);}if(opts.pause){$cont.hover(function(){this.cyclePause=1;},function(){this.cyclePause=0;});}var txFn=$.fn.cycle.transitions[opts.fx];txFn&&txFn($cont,$slides,opts);$slides.each(function(){var $el=$(this);this.cycleH=(opts.fit&&opts.height)?opts.height:$el.height();this.cycleW=(opts.fit&&opts.width)?opts.width:$el.width();});if(opts.cssFirst){$($slides[first]).css(opts.cssFirst);}if(opts.timeout){if(opts.speed.constructor==String){opts.speed={slow:600,fast:200}[opts.speed]||400;}if(!opts.sync){opts.speed=opts.speed/2;}while((opts.timeout-opts.speed)<250){opts.timeout+=opts.speed;}}opts.speedIn=opts.speed;opts.speedOut=opts.speed;opts.slideCount=els.length;opts.currSlide=first;opts.nextSlide=1;var e0=$slides[first];if(opts.before.length){opts.before[0].apply(e0,[e0,e0,opts,true]);}if(opts.after.length>1){opts.after[1].apply(e0,[e0,e0,opts,true]);}if(opts.click&&!opts.next){opts.next=opts.click;}if(opts.next){$(opts.next).bind("click",function(){return advance(els,opts,opts.rev?-1:1);});}if(opts.prev){$(opts.prev).bind("click",function(){return advance(els,opts,opts.rev?1:-1);});}if(opts.timeout){this.cycleTimeout=setTimeout(function(){go(els,opts,0,!opts.rev);},opts.timeout+(opts.delay||0));}});};function go(els,opts,manual,fwd){if(opts.busy){return ;}var p=els[0].parentNode,curr=els[opts.currSlide],next=els[opts.nextSlide];if(p.cycleTimeout===0&&!manual){return ;}if(manual||!p.cyclePause){if(opts.before.length){$.each(opts.before,function(i,o){o.apply(next,[curr,next,opts,fwd]);});}var after=function(){if($.browser.msie){this.style.removeAttribute("filter");}$.each(opts.after,function(i,o){o.apply(next,[curr,next,opts,fwd]);});};if(opts.nextSlide!=opts.currSlide){opts.busy=1;$.fn.cycle.custom(curr,next,opts,after);}var roll=(opts.nextSlide+1)==els.length;opts.nextSlide=roll?0:opts.nextSlide+1;opts.currSlide=roll?els.length-1:opts.nextSlide-1;}if(opts.timeout){p.cycleTimeout=setTimeout(function(){go(els,opts,0,!opts.rev);},opts.timeout);}}function advance(els,opts,val){var p=els[0].parentNode,timeout=p.cycleTimeout;if(timeout){clearTimeout(timeout);p.cycleTimeout=0;}opts.nextSlide=opts.currSlide+val;if(opts.nextSlide<0){opts.nextSlide=els.length-1;}else{if(opts.nextSlide>=els.length){opts.nextSlide=0;}}go(els,opts,1,val>=0);return false;}$.fn.cycle.custom=function(curr,next,opts,cb){var $l=$(curr),$n=$(next);$n.css(opts.cssBefore);var fn=function(){$n.animate(opts.animIn,opts.speedIn,opts.easeIn,cb);};$l.animate(opts.animOut,opts.speedOut,opts.easeOut,function(){$l.css(opts.cssAfter);if(!opts.sync){fn();}});if(opts.sync){fn();}};$.fn.cycle.transitions={fade:function($cont,$slides,opts){opts.cssBefore={opacity:0};opts.animOut={opacity:0};opts.animIn={opacity:1};}};$.fn.cycle.ver=function(){return ver;};$.fn.cycle.defaults={fx:"fade",timeout:4000,speed:1000,next:null,prev:null,before:null,after:null,height:"auto",sync:1,fit:0,pause:0,delay:0,slideExpr:null,cssBefore:{},cssAfter:{},animIn:{},animOut:{}};})(jQuery);
diff --git a/js/jquery.cycle.min.js b/js/jquery.cycle.min.js
index 681b399..c3cfe0f 100644
--- a/js/jquery.cycle.min.js
+++ b/js/jquery.cycle.min.js
@@ -1,10 +1,10 @@
 /*
- * jQuery Cycle Plugin (core engine)
+ * jQuery Cycle Plugin (core engine only)
  * Examples and documentation at: http://jquery.malsup.com/cycle/
  * Copyright (c) 2007-2010 M. Alsup
- * Version: 2.88 (08-JUN-2010)
+ * Version: 2.99 (12-MAR-2011)
  * Dual licensed under the MIT and GPL licenses.
  * http://jquery.malsup.com/license.html
- * Requires: jQuery v1.2.6 or later
+ * Requires: jQuery v1.3.2 or later
  */
-(function($){var ver="2.88";if($.support==undefined){$.support={opacity:!($.browser.msie)};}function debug(s){if($.fn.cycle.debug){log(s);}}function log(){if(window.console&&window.console.log){window.console.log("[cycle] "+Array.prototype.join.call(arguments," "));}}$.fn.cycle=function(options,arg2){var o={s:this.selector,c:this.context};if(this.length===0&&options!="stop"){if(!$.isReady&&o.s){log("DOM not ready, queuing slideshow");$(function(){$(o.s,o.c).cycle(options,arg2);});return this;}log("terminating; zero elements found by selector"+($.isReady?"":" (DOM not ready)"));return this;}return this.each(function(){var opts=handleArguments(this,options,arg2);if(opts===false){return;}opts.updateActivePagerLink=opts.updateActivePagerLink||$.fn.cycle.updateActivePagerLink;if(this.cycleTimeout){clearTimeout(this.cycleTimeout);}this.cycleTimeout=this.cyclePause=0;var $cont=$(this);var $slides=opts.slideExpr?$(opts.slideExpr,this):$cont.children();var els=$slides.get();if(els.length<2){log("terminating; too few slides: "+els.length);return;}var opts2=buildOptions($cont,$slides,els,opts,o);if(opts2===false){return;}var startTime=opts2.continuous?10:getTimeout(els[opts2.currSlide],els[opts2.nextSlide],opts2,!opts2.rev);if(startTime){startTime+=(opts2.delay||0);if(startTime<10){startTime=10;}debug("first timeout: "+startTime);this.cycleTimeout=setTimeout(function(){go(els,opts2,0,(!opts2.rev&&!opts.backwards));},startTime);}});};function handleArguments(cont,options,arg2){if(cont.cycleStop==undefined){cont.cycleStop=0;}if(options===undefined||options===null){options={};}if(options.constructor==String){switch(options){case"destroy":case"stop":var opts=$(cont).data("cycle.opts");if(!opts){return false;}cont.cycleStop++;if(cont.cycleTimeout){clearTimeout(cont.cycleTimeout);}cont.cycleTimeout=0;$(cont).removeData("cycle.opts");if(options=="destroy"){destroy(opts);}return false;case"toggle":cont.cyclePause=(cont.cyclePause===1)?0:1;checkInstantResume(cont.cyclePause,arg2,cont);return false;case"pause":cont.cyclePause=1;return false;case"resume":cont.cyclePause=0;checkInstantResume(false,arg2,cont);return false;case"prev":case"next":var opts=$(cont).data("cycle.opts");if(!opts){log('options not found, "prev/next" ignored');return false;}$.fn.cycle[options](opts);return false;default:options={fx:options};}return options;}else{if(options.constructor==Number){var num=options;options=$(cont).data("cycle.opts");if(!options){log("options not found, can not advance slide");return false;}if(num<0||num>=options.elements.length){log("invalid slide index: "+num);return false;}options.nextSlide=num;if(cont.cycleTimeout){clearTimeout(cont.cycleTimeout);cont.cycleTimeout=0;}if(typeof arg2=="string"){options.oneTimeFx=arg2;}go(options.elements,options,1,num>=options.currSlide);return false;}}return options;function checkInstantResume(isPaused,arg2,cont){if(!isPaused&&arg2===true){var options=$(cont).data("cycle.opts");if(!options){log("options not found, can not resume");return false;}if(cont.cycleTimeout){clearTimeout(cont.cycleTimeout);cont.cycleTimeout=0;}go(options.elements,options,1,(!opts.rev&&!opts.backwards));}}}function removeFilter(el,opts){if(!$.support.opacity&&opts.cleartype&&el.style.filter){try{el.style.removeAttribute("filter");}catch(smother){}}}function destroy(opts){if(opts.next){$(opts.next).unbind(opts.prevNextEvent);}if(opts.prev){$(opts.prev).unbind(opts.prevNextEvent);}if(opts.pager||opts.pagerAnchorBuilder){$.each(opts.pagerAnchors||[],function(){this.unbind().remove();});}opts.pagerAnchors=null;if(opts.destroy){opts.destroy(opts);}}function buildOptions($cont,$slides,els,options,o){var opts=$.extend({},$.fn.cycle.defaults,options||{},$.metadata?$cont.metadata():$.meta?$cont.data():{});if(opts.autostop){opts.countdown=opts.autostopCount||els.length;}var cont=$cont[0];$cont.data("cycle.opts",opts);opts.$cont=$cont;opts.stopCount=cont.cycleStop;opts.elements=els;opts.before=opts.before?[opts.before]:[];opts.after=opts.after?[opts.after]:[];opts.after.unshift(function(){opts.busy=0;});if(!$.support.opacity&&opts.cleartype){opts.after.push(function(){removeFilter(this,opts);});}if(opts.continuous){opts.after.push(function(){go(els,opts,0,(!opts.rev&&!opts.backwards));});}saveOriginalOpts(opts);if(!$.support.opacity&&opts.cleartype&&!opts.cleartypeNoBg){clearTypeFix($slides);}if($cont.css("position")=="static"){$cont.css("position","relative");}if(opts.width){$cont.width(opts.width);}if(opts.height&&opts.height!="auto"){$cont.height(opts.height);}if(opts.startingSlide){opts.startingSlide=parseInt(opts.startingSlide);}else{if(opts.backwards){opts.startingSlide=els.length-1;}}if(opts.random){opts.randomMap=[];for(var i=0;i<els.length;i++){opts.randomMap.push(i);}opts.randomMap.sort(function(a,b){return Math.random()-0.5;});opts.randomIndex=1;opts.startingSlide=opts.randomMap[1];}else{if(opts.startingSlide>=els.length){opts.startingSlide=0;}}opts.currSlide=opts.startingSlide||0;var first=opts.startingSlide;$slides.css({position:"absolute",top:0,left:0}).hide().each(function(i){var z;if(opts.backwards){z=first?i<=first?els.length+(i-first):first-i:els.length-i;}else{z=first?i>=first?els.length-(i-first):first-i:els.length-i;}$(this).css("z-index",z);});$(els[first]).css("opacity",1).show();removeFilter(els[first],opts);if(opts.fit&&opts.width){$slides.width(opts.width);}if(opts.fit&&opts.height&&opts.height!="auto"){$slides.height(opts.height);}var reshape=opts.containerResize&&!$cont.innerHeight();if(reshape){var maxw=0,maxh=0;for(var j=0;j<els.length;j++){var $e=$(els[j]),e=$e[0],w=$e.outerWidth(),h=$e.outerHeight();if(!w){w=e.offsetWidth||e.width||$e.attr("width");}if(!h){h=e.offsetHeight||e.height||$e.attr("height");}maxw=w>maxw?w:maxw;maxh=h>maxh?h:maxh;}if(maxw>0&&maxh>0){$cont.css({width:maxw+"px",height:maxh+"px"});}}if(opts.pause){$cont.hover(function(){this.cyclePause++;},function(){this.cyclePause--;});}if(supportMultiTransitions(opts)===false){return false;}var requeue=false;options.requeueAttempts=options.requeueAttempts||0;$slides.each(function(){var $el=$(this);this.cycleH=(opts.fit&&opts.height)?opts.height:($el.height()||this.offsetHeight||this.height||$el.attr("height")||0);this.cycleW=(opts.fit&&opts.width)?opts.width:($el.width()||this.offsetWidth||this.width||$el.attr("width")||0);if($el.is("img")){var loadingIE=($.browser.msie&&this.cycleW==28&&this.cycleH==30&&!this.complete);var loadingFF=($.browser.mozilla&&this.cycleW==34&&this.cycleH==19&&!this.complete);var loadingOp=($.browser.opera&&((this.cycleW==42&&this.cycleH==19)||(this.cycleW==37&&this.cycleH==17))&&!this.complete);var loadingOther=(this.cycleH==0&&this.cycleW==0&&!this.complete);if(loadingIE||loadingFF||loadingOp||loadingOther){if(o.s&&opts.requeueOnImageNotLoaded&&++options.requeueAttempts<100){log(options.requeueAttempts," - img slide not loaded, requeuing slideshow: ",this.src,this.cycleW,this.cycleH);setTimeout(function(){$(o.s,o.c).cycle(options);},opts.requeueTimeout);requeue=true;return false;}else{log("could not determine size of image: "+this.src,this.cycleW,this.cycleH);}}}return true;});if(requeue){return false;}opts.cssBefore=opts.cssBefore||{};opts.animIn=opts.animIn||{};opts.animOut=opts.animOut||{};$slides.not(":eq("+first+")").css(opts.cssBefore);if(opts.cssFirst){$($slides[first]).css(opts.cssFirst);}if(opts.timeout){opts.timeout=parseInt(opts.timeout);if(opts.speed.constructor==String){opts.speed=$.fx.speeds[opts.speed]||parseInt(opts.speed);}if(!opts.sync){opts.speed=opts.speed/2;}var buffer=opts.fx=="shuffle"?500:250;while((opts.timeout-opts.speed)<buffer){opts.timeout+=opts.speed;}}if(opts.easing){opts.easeIn=opts.easeOut=opts.easing;}if(!opts.speedIn){opts.speedIn=opts.speed;}if(!opts.speedOut){opts.speedOut=opts.speed;}opts.slideCount=els.length;opts.currSlide=opts.lastSlide=first;if(opts.random){if(++opts.randomIndex==els.length){opts.randomIndex=0;}opts.nextSlide=opts.randomMap[opts.randomIndex];}else{if(opts.backwards){opts.nextSlide=opts.startingSlide==0?(els.length-1):opts.startingSlide-1;}else{opts.nextSlide=opts.startingSlide>=(els.length-1)?0:opts.startingSlide+1;}}if(!opts.multiFx){var init=$.fn.cycle.transitions[opts.fx];if($.isFunction(init)){init($cont,$slides,opts);}else{if(opts.fx!="custom"&&!opts.multiFx){log("unknown transition: "+opts.fx,"; slideshow terminating");return false;}}}var e0=$slides[first];if(opts.before.length){opts.before[0].apply(e0,[e0,e0,opts,true]);}if(opts.after.length>1){opts.after[1].apply(e0,[e0,e0,opts,true]);}if(opts.next){$(opts.next).bind(opts.prevNextEvent,function(){return advance(opts,opts.rev?-1:1);});}if(opts.prev){$(opts.prev).bind(opts.prevNextEvent,function(){return advance(opts,opts.rev?1:-1);});}if(opts.pager||opts.pagerAnchorBuilder){buildPager(els,opts);}exposeAddSlide(opts,els);return opts;}function saveOriginalOpts(opts){opts.original={before:[],after:[]};opts.original.cssBefore=$.extend({},opts.cssBefore);opts.original.cssAfter=$.extend({},opts.cssAfter);opts.original.animIn=$.extend({},opts.animIn);opts.original.animOut=$.extend({},opts.animOut);$.each(opts.before,function(){opts.original.before.push(this);});$.each(opts.after,function(){opts.original.after.push(this);});}function supportMultiTransitions(opts){var i,tx,txs=$.fn.cycle.transitions;if(opts.fx.indexOf(",")>0){opts.multiFx=true;opts.fxs=opts.fx.replace(/\s*/g,"").split(",");for(i=0;i<opts.fxs.length;i++){var fx=opts.fxs[i];tx=txs[fx];if(!tx||!txs.hasOwnProperty(fx)||!$.isFunction(tx)){log("discarding unknown transition: ",fx);opts.fxs.splice(i,1);i--;}}if(!opts.fxs.length){log("No valid transitions named; slideshow terminating.");return false;}}else{if(opts.fx=="all"){opts.multiFx=true;opts.fxs=[];for(p in txs){tx=txs[p];if(txs.hasOwnProperty(p)&&$.isFunction(tx)){opts.fxs.push(p);}}}}if(opts.multiFx&&opts.randomizeEffects){var r1=Math.floor(Math.random()*20)+30;for(i=0;i<r1;i++){var r2=Math.floor(Math.random()*opts.fxs.length);opts.fxs.push(opts.fxs.splice(r2,1)[0]);}debug("randomized fx sequence: ",opts.fxs);}return true;}function exposeAddSlide(opts,els){opts.addSlide=function(newSlide,prepend){var $s=$(newSlide),s=$s[0];if(!opts.autostopCount){opts.countdown++;}els[prepend?"unshift":"push"](s);if(opts.els){opts.els[prepend?"unshift":"push"](s);}opts.slideCount=els.length;$s.css("position","absolute");$s[prepend?"prependTo":"appendTo"](opts.$cont);if(prepend){opts.currSlide++;opts.nextSlide++;}if(!$.support.opacity&&opts.cleartype&&!opts.cleartypeNoBg){clearTypeFix($s);}if(opts.fit&&opts.width){$s.width(opts.width);}if(opts.fit&&opts.height&&opts.height!="auto"){$slides.height(opts.height);}s.cycleH=(opts.fit&&opts.height)?opts.height:$s.height();s.cycleW=(opts.fit&&opts.width)?opts.width:$s.width();$s.css(opts.cssBefore);if(opts.pager||opts.pagerAnchorBuilder){$.fn.cycle.createPagerAnchor(els.length-1,s,$(opts.pager),els,opts);}if($.isFunction(opts.onAddSlide)){opts.onAddSlide($s);}else{$s.hide();}};}$.fn.cycle.resetState=function(opts,fx){fx=fx||opts.fx;opts.before=[];opts.after=[];opts.cssBefore=$.extend({},opts.original.cssBefore);opts.cssAfter=$.extend({},opts.original.cssAfter);opts.animIn=$.extend({},opts.original.animIn);opts.animOut=$.extend({},opts.original.animOut);opts.fxFn=null;$.each(opts.original.before,function(){opts.before.push(this);});$.each(opts.original.after,function(){opts.after.push(this);});var init=$.fn.cycle.transitions[fx];if($.isFunction(init)){init(opts.$cont,$(opts.elements),opts);}};function go(els,opts,manual,fwd){if(manual&&opts.busy&&opts.manualTrump){debug("manualTrump in go(), stopping active transition");$(els).stop(true,true);opts.busy=false;}if(opts.busy){debug("transition active, ignoring new tx request");return;}var p=opts.$cont[0],curr=els[opts.currSlide],next=els[opts.nextSlide];if(p.cycleStop!=opts.stopCount||p.cycleTimeout===0&&!manual){return;}if(!manual&&!p.cyclePause&&!opts.bounce&&((opts.autostop&&(--opts.countdown<=0))||(opts.nowrap&&!opts.random&&opts.nextSlide<opts.currSlide))){if(opts.end){opts.end(opts);}return;}var changed=false;if((manual||!p.cyclePause)&&(opts.nextSlide!=opts.currSlide)){changed=true;var fx=opts.fx;curr.cycleH=curr.cycleH||$(curr).height();curr.cycleW=curr.cycleW||$(curr).width();next.cycleH=next.cycleH||$(next).height();next.cycleW=next.cycleW||$(next).width();if(opts.multiFx){if(opts.lastFx==undefined||++opts.lastFx>=opts.fxs.length){opts.lastFx=0;}fx=opts.fxs[opts.lastFx];opts.currFx=fx;}if(opts.oneTimeFx){fx=opts.oneTimeFx;opts.oneTimeFx=null;}$.fn.cycle.resetState(opts,fx);if(opts.before.length){$.each(opts.before,function(i,o){if(p.cycleStop!=opts.stopCount){return;}o.apply(next,[curr,next,opts,fwd]);});}var after=function(){$.each(opts.after,function(i,o){if(p.cycleStop!=opts.stopCount){return;}o.apply(next,[curr,next,opts,fwd]);});};debug("tx firing; currSlide: "+opts.currSlide+"; nextSlide: "+opts.nextSlide);opts.busy=1;if(opts.fxFn){opts.fxFn(curr,next,opts,after,fwd,manual&&opts.fastOnEvent);}else{if($.isFunction($.fn.cycle[opts.fx])){$.fn.cycle[opts.fx](curr,next,opts,after,fwd,manual&&opts.fastOnEvent);}else{$.fn.cycle.custom(curr,next,opts,after,fwd,manual&&opts.fastOnEvent);}}}if(changed||opts.nextSlide==opts.currSlide){opts.lastSlide=opts.currSlide;if(opts.random){opts.currSlide=opts.nextSlide;if(++opts.randomIndex==els.length){opts.randomIndex=0;}opts.nextSlide=opts.randomMap[opts.randomIndex];if(opts.nextSlide==opts.currSlide){opts.nextSlide=(opts.currSlide==opts.slideCount-1)?0:opts.currSlide+1;}}else{if(opts.backwards){var roll=(opts.nextSlide-1)<0;if(roll&&opts.bounce){opts.backwards=!opts.backwards;opts.nextSlide=1;opts.currSlide=0;}else{opts.nextSlide=roll?(els.length-1):opts.nextSlide-1;opts.currSlide=roll?0:opts.nextSlide+1;}}else{var roll=(opts.nextSlide+1)==els.length;if(roll&&opts.bounce){opts.backwards=!opts.backwards;opts.nextSlide=els.length-2;opts.currSlide=els.length-1;}else{opts.nextSlide=roll?0:opts.nextSlide+1;opts.currSlide=roll?els.length-1:opts.nextSlide-1;}}}}if(changed&&opts.pager){opts.updateActivePagerLink(opts.pager,opts.currSlide,opts.activePagerClass);}var ms=0;if(opts.timeout&&!opts.continuous){ms=getTimeout(els[opts.currSlide],els[opts.nextSlide],opts,fwd);}else{if(opts.continuous&&p.cyclePause){ms=10;}}if(ms>0){p.cycleTimeout=setTimeout(function(){go(els,opts,0,(!opts.rev&&!opts.backwards));},ms);}}$.fn.cycle.updateActivePagerLink=function(pager,currSlide,clsName){$(pager).each(function(){$(this).children().removeClass(clsName).eq(currSlide).addClass(clsName);});};function getTimeout(curr,next,opts,fwd){if(opts.timeoutFn){var t=opts.timeoutFn.call(curr,curr,next,opts,fwd);while((t-opts.speed)<250){t+=opts.speed;}debug("calculated timeout: "+t+"; speed: "+opts.speed);if(t!==false){return t;}}return opts.timeout;}$.fn.cycle.next=function(opts){advance(opts,opts.rev?-1:1);};$.fn.cycle.prev=function(opts){advance(opts,opts.rev?1:-1);};function advance(opts,val){var els=opts.elements;var p=opts.$cont[0],timeout=p.cycleTimeout;if(timeout){clearTimeout(timeout);p.cycleTimeout=0;}if(opts.random&&val<0){opts.randomIndex--;if(--opts.randomIndex==-2){opts.randomIndex=els.length-2;}else{if(opts.randomIndex==-1){opts.randomIndex=els.length-1;}}opts.nextSlide=opts.randomMap[opts.randomIndex];}else{if(opts.random){opts.nextSlide=opts.randomMap[opts.randomIndex];}else{opts.nextSlide=opts.currSlide+val;if(opts.nextSlide<0){if(opts.nowrap){return false;}opts.nextSlide=els.length-1;}else{if(opts.nextSlide>=els.length){if(opts.nowrap){return false;}opts.nextSlide=0;}}}}var cb=opts.onPrevNextEvent||opts.prevNextClick;if($.isFunction(cb)){cb(val>0,opts.nextSlide,els[opts.nextSlide]);}go(els,opts,1,val>=0);return false;}function buildPager(els,opts){var $p=$(opts.pager);$.each(els,function(i,o){$.fn.cycle.createPagerAnchor(i,o,$p,els,opts);});opts.updateActivePagerLink(opts.pager,opts.startingSlide,opts.activePagerClass);}$.fn.cycle.createPagerAnchor=function(i,el,$p,els,opts){var a;if($.isFunction(opts.pagerAnchorBuilder)){a=opts.pagerAnchorBuilder(i,el);debug("pagerAnchorBuilder("+i+", el) returned: "+a);}else{a='<a href="#">'+(i+1)+"</a>";}if(!a){return;}var $a=$(a);if($a.parents("body").length===0){var arr=[];if($p.length>1){$p.each(function(){var $clone=$a.clone(true);$(this).append($clone);arr.push($clone[0]);});$a=$(arr);}else{$a.appendTo($p);}}opts.pagerAnchors=opts.pagerAnchors||[];opts.pagerAnchors.push($a);$a.bind(opts.pagerEvent,function(e){e.preventDefault();opts.nextSlide=i;var p=opts.$cont[0],timeout=p.cycleTimeout;if(timeout){clearTimeout(timeout);p.cycleTimeout=0;}var cb=opts.onPagerEvent||opts.pagerClick;if($.isFunction(cb)){cb(opts.nextSlide,els[opts.nextSlide]);}go(els,opts,1,opts.currSlide<i);});if(!/^click/.test(opts.pagerEvent)&&!opts.allowPagerClickBubble){$a.bind("click.cycle",function(){return false;});}if(opts.pauseOnPagerHover){$a.hover(function(){opts.$cont[0].cyclePause++;},function(){opts.$cont[0].cyclePause--;});}};$.fn.cycle.hopsFromLast=function(opts,fwd){var hops,l=opts.lastSlide,c=opts.currSlide;if(fwd){hops=c>l?c-l:opts.slideCount-l;}else{hops=c<l?l-c:l+opts.slideCount-c;}return hops;};function clearTypeFix($slides){debug("applying clearType background-color hack");function hex(s){s=parseInt(s).toString(16);return s.length<2?"0"+s:s;}function getBg(e){for(;e&&e.nodeName.toLowerCase()!="html";e=e.parentNode){var v=$.css(e,"background-color");if(v.indexOf("rgb")>=0){var rgb=v.match(/\d+/g);return"#"+hex(rgb[0])+hex(rgb[1])+hex(rgb[2]);}if(v&&v!="transparent"){return v;}}return"#ffffff";}$slides.each(function(){$(this).css("background-color",getBg(this));});}$.fn.cycle.commonReset=function(curr,next,opts,w,h,rev){$(opts.elements).not(curr).hide();opts.cssBefore.opacity=1;opts.cssBefore.display="block";if(w!==false&&next.cycleW>0){opts.cssBefore.width=next.cycleW;}if(h!==false&&next.cycleH>0){opts.cssBefore.height=next.cycleH;}opts.cssAfter=opts.cssAfter||{};opts.cssAfter.display="none";$(curr).css("zIndex",opts.slideCount+(rev===true?1:0));$(next).css("zIndex",opts.slideCount+(rev===true?0:1));};$.fn.cycle.custom=function(curr,next,opts,cb,fwd,speedOverride){var $l=$(curr),$n=$(next);var speedIn=opts.speedIn,speedOut=opts.speedOut,easeIn=opts.easeIn,easeOut=opts.easeOut;$n.css(opts.cssBefore);if(speedOverride){if(typeof speedOverride=="number"){speedIn=speedOut=speedOverride;}else{speedIn=speedOut=1;}easeIn=easeOut=null;}var fn=function(){$n.animate(opts.animIn,speedIn,easeIn,cb);};$l.animate(opts.animOut,speedOut,easeOut,function(){if(opts.cssAfter){$l.css(opts.cssAfter);}if(!opts.sync){fn();}});if(opts.sync){fn();}};$.fn.cycle.transitions={fade:function($cont,$slides,opts){$slides.not(":eq("+opts.currSlide+")").css("opacity",0);opts.before.push(function(curr,next,opts){$.fn.cycle.commonReset(curr,next,opts);opts.cssBefore.opacity=0;});opts.animIn={opacity:1};opts.animOut={opacity:0};opts.cssBefore={top:0,left:0};}};$.fn.cycle.ver=function(){return ver;};$.fn.cycle.defaults={fx:"fade",timeout:4000,timeoutFn:null,continuous:0,speed:1000,speedIn:null,speedOut:null,next:null,prev:null,onPrevNextEvent:null,prevNextEvent:"click.cycle",pager:null,onPagerEvent:null,pagerEvent:"click.cycle",allowPagerClickBubble:false,pagerAnchorBuilder:null,before:null,after:null,end:null,easing:null,easeIn:null,easeOut:null,shuffle:null,animIn:null,animOut:null,cssBefore:null,cssAfter:null,fxFn:null,height:"auto",startingSlide:0,sync:1,random:0,fit:0,containerResize:1,pause:0,pauseOnPagerHover:0,autostop:0,autostopCount:0,delay:0,slideExpr:null,cleartype:!$.support.opacity,cleartypeNoBg:false,nowrap:0,fastOnEvent:0,randomizeEffects:1,rev:0,manualTrump:true,requeueOnImageNotLoaded:true,requeueTimeout:250,activePagerClass:"activeSlide",updateActivePagerLink:null,backwards:false};})(jQuery);
\ No newline at end of file
+(function($){var ver="2.99";if($.support==undefined){$.support={opacity:!($.browser.msie)};}function debug(s){$.fn.cycle.debug&&log(s);}function log(){window.console&&console.log&&console.log("[cycle] "+Array.prototype.join.call(arguments," "));}$.expr[":"].paused=function(el){return el.cyclePause;};$.fn.cycle=function(options,arg2){var o={s:this.selector,c:this.context};if(this.length===0&&options!="stop"){if(!$.isReady&&o.s){log("DOM not ready, queuing slideshow");$(function(){$(o.s,o.c).cycle(options,arg2);});return this;}log("terminating; zero elements found by selector"+($.isReady?"":" (DOM not ready)"));return this;}return this.each(function(){var opts=handleArguments(this,options,arg2);if(opts===false){return;}opts.updateActivePagerLink=opts.updateActivePagerLink||$.fn.cycle.updateActivePagerLink;if(this.cycleTimeout){clearTimeout(this.cycleTimeout);}this.cycleTimeout=this.cyclePause=0;var $cont=$(this);var $slides=opts.slideExpr?$(opts.slideExpr,this):$cont.children();var els=$slides.get();if(els.length<2){log("terminating; too few slides: "+els.length);return;}var opts2=buildOptions($cont,$slides,els,opts,o);if(opts2===false){return;}var startTime=opts2.continuous?10:getTimeout(els[opts2.currSlide],els[opts2.nextSlide],opts2,!opts2.backwards);if(startTime){startTime+=(opts2.delay||0);if(startTime<10){startTime=10;}debug("first timeout: "+startTime);this.cycleTimeout=setTimeout(function(){go(els,opts2,0,!opts.backwards);},startTime);}});};function handleArguments(cont,options,arg2){if(cont.cycleStop==undefined){cont.cycleStop=0;}if(options===undefined||options===null){options={};}if(options.constructor==String){switch(options){case"destroy":case"stop":var opts=$(cont).data("cycle.opts");if(!opts){return false;}cont.cycleStop++;if(cont.cycleTimeout){clearTimeout(cont.cycleTimeout);}cont.cycleTimeout=0;$(cont).removeData("cycle.opts");if(options=="destroy"){destroy(opts);}return false;case"toggle":cont.cyclePause=(cont.cyclePause===1)?0:1;checkInstantResume(cont.cyclePause,arg2,cont);return false;case"pause":cont.cyclePause=1;return false;case"resume":cont.cyclePause=0;checkInstantResume(false,arg2,cont);return false;case"prev":case"next":var opts=$(cont).data("cycle.opts");if(!opts){log('options not found, "prev/next" ignored');return false;}$.fn.cycle[options](opts);return false;default:options={fx:options};}return options;}else{if(options.constructor==Number){var num=options;options=$(cont).data("cycle.opts");if(!options){log("options not found, can not advance slide");return false;}if(num<0||num>=options.elements.length){log("invalid slide index: "+num);return false;}options.nextSlide=num;if(cont.cycleTimeout){clearTimeout(cont.cycleTimeout);cont.cycleTimeout=0;}if(typeof arg2=="string"){options.oneTimeFx=arg2;}go(options.elements,options,1,num>=options.currSlide);return false;}}return options;function checkInstantResume(isPaused,arg2,cont){if(!isPaused&&arg2===true){var options=$(cont).data("cycle.opts");if(!options){log("options not found, can not resume");return false;}if(cont.cycleTimeout){clearTimeout(cont.cycleTimeout);cont.cycleTimeout=0;}go(options.elements,options,1,!options.backwards);}}}function removeFilter(el,opts){if(!$.support.opacity&&opts.cleartype&&el.style.filter){try{el.style.removeAttribute("filter");}catch(smother){}}}function destroy(opts){if(opts.next){$(opts.next).unbind(opts.prevNextEvent);}if(opts.prev){$(opts.prev).unbind(opts.prevNextEvent);}if(opts.pager||opts.pagerAnchorBuilder){$.each(opts.pagerAnchors||[],function(){this.unbind().remove();});}opts.pagerAnchors=null;if(opts.destroy){opts.destroy(opts);}}function buildOptions($cont,$slides,els,options,o){var opts=$.extend({},$.fn.cycle.defaults,options||{},$.metadata?$cont.metadata():$.meta?$cont.data():{});if(opts.autostop){opts.countdown=opts.autostopCount||els.length;}var cont=$cont[0];$cont.data("cycle.opts",opts);opts.$cont=$cont;opts.stopCount=cont.cycleStop;opts.elements=els;opts.before=opts.before?[opts.before]:[];opts.after=opts.after?[opts.after]:[];if(!$.support.opacity&&opts.cleartype){opts.after.push(function(){removeFilter(this,opts);});}if(opts.continuous){opts.after.push(function(){go(els,opts,0,!opts.backwards);});}saveOriginalOpts(opts);if(!$.support.opacity&&opts.cleartype&&!opts.cleartypeNoBg){clearTypeFix($slides);}if($cont.css("position")=="static"){$cont.css("position","relative");}if(opts.width){$cont.width(opts.width);}if(opts.height&&opts.height!="auto"){$cont.height(opts.height);}if(opts.startingSlide){opts.startingSlide=parseInt(opts.startingSlide);}else{if(opts.backwards){opts.startingSlide=els.length-1;}}if(opts.random){opts.randomMap=[];for(var i=0;i<els.length;i++){opts.randomMap.push(i);}opts.randomMap.sort(function(a,b){return Math.random()-0.5;});opts.randomIndex=1;opts.startingSlide=opts.randomMap[1];}else{if(opts.startingSlide>=els.length){opts.startingSlide=0;}}opts.currSlide=opts.startingSlide||0;var first=opts.startingSlide;$slides.css({position:"absolute",top:0,left:0}).hide().each(function(i){var z;if(opts.backwards){z=first?i<=first?els.length+(i-first):first-i:els.length-i;}else{z=first?i>=first?els.length-(i-first):first-i:els.length-i;}$(this).css("z-index",z);});$(els[first]).css("opacity",1).show();removeFilter(els[first],opts);if(opts.fit&&opts.width){$slides.width(opts.width);}if(opts.fit&&opts.height&&opts.height!="auto"){$slides.height(opts.height);}var reshape=opts.containerResize&&!$cont.innerHeight();if(reshape){var maxw=0,maxh=0;for(var j=0;j<els.length;j++){var $e=$(els[j]),e=$e[0],w=$e.outerWidth(),h=$e.outerHeight();if(!w){w=e.offsetWidth||e.width||$e.attr("width");}if(!h){h=e.offsetHeight||e.height||$e.attr("height");}maxw=w>maxw?w:maxw;maxh=h>maxh?h:maxh;}if(maxw>0&&maxh>0){$cont.css({width:maxw+"px",height:maxh+"px"});}}if(opts.pause){$cont.hover(function(){this.cyclePause++;},function(){this.cyclePause--;});}if(supportMultiTransitions(opts)===false){return false;}var requeue=false;options.requeueAttempts=options.requeueAttempts||0;$slides.each(function(){var $el=$(this);this.cycleH=(opts.fit&&opts.height)?opts.height:($el.height()||this.offsetHeight||this.height||$el.attr("height")||0);this.cycleW=(opts.fit&&opts.width)?opts.width:($el.width()||this.offsetWidth||this.width||$el.attr("width")||0);if($el.is("img")){var loadingIE=($.browser.msie&&this.cycleW==28&&this.cycleH==30&&!this.complete);var loadingFF=($.browser.mozilla&&this.cycleW==34&&this.cycleH==19&&!this.complete);var loadingOp=($.browser.opera&&((this.cycleW==42&&this.cycleH==19)||(this.cycleW==37&&this.cycleH==17))&&!this.complete);var loadingOther=(this.cycleH==0&&this.cycleW==0&&!this.complete);if(loadingIE||loadingFF||loadingOp||loadingOther){if(o.s&&opts.requeueOnImageNotLoaded&&++options.requeueAttempts<100){log(options.requeueAttempts," - img slide not loaded, requeuing slideshow: ",this.src,this.cycleW,this.cycleH);setTimeout(function(){$(o.s,o.c).cycle(options);},opts.requeueTimeout);requeue=true;return false;}else{log("could not determine size of image: "+this.src,this.cycleW,this.cycleH);}}}return true;});if(requeue){return false;}opts.cssBefore=opts.cssBefore||{};opts.cssAfter=opts.cssAfter||{};opts.cssFirst=opts.cssFirst||{};opts.animIn=opts.animIn||{};opts.animOut=opts.animOut||{};$slides.not(":eq("+first+")").css(opts.cssBefore);$($slides[first]).css(opts.cssFirst);if(opts.timeout){opts.timeout=parseInt(opts.timeout);if(opts.speed.constructor==String){opts.speed=$.fx.speeds[opts.speed]||parseInt(opts.speed);}if(!opts.sync){opts.speed=opts.speed/2;}var buffer=opts.fx=="none"?0:opts.fx=="shuffle"?500:250;while((opts.timeout-opts.speed)<buffer){opts.timeout+=opts.speed;}}if(opts.easing){opts.easeIn=opts.easeOut=opts.easing;}if(!opts.speedIn){opts.speedIn=opts.speed;}if(!opts.speedOut){opts.speedOut=opts.speed;}opts.slideCount=els.length;opts.currSlide=opts.lastSlide=first;if(opts.random){if(++opts.randomIndex==els.length){opts.randomIndex=0;}opts.nextSlide=opts.randomMap[opts.randomIndex];}else{if(opts.backwards){opts.nextSlide=opts.startingSlide==0?(els.length-1):opts.startingSlide-1;}else{opts.nextSlide=opts.startingSlide>=(els.length-1)?0:opts.startingSlide+1;}}if(!opts.multiFx){var init=$.fn.cycle.transitions[opts.fx];if($.isFunction(init)){init($cont,$slides,opts);}else{if(opts.fx!="custom"&&!opts.multiFx){log("unknown transition: "+opts.fx,"; slideshow terminating");return false;}}}var e0=$slides[first];if(opts.before.length){opts.before[0].apply(e0,[e0,e0,opts,true]);}if(opts.after.length){opts.after[0].apply(e0,[e0,e0,opts,true]);}if(opts.next){$(opts.next).bind(opts.prevNextEvent,function(){return advance(opts,1);});}if(opts.prev){$(opts.prev).bind(opts.prevNextEvent,function(){return advance(opts,0);});}if(opts.pager||opts.pagerAnchorBuilder){buildPager(els,opts);}exposeAddSlide(opts,els);return opts;}function saveOriginalOpts(opts){opts.original={before:[],after:[]};opts.original.cssBefore=$.extend({},opts.cssBefore);opts.original.cssAfter=$.extend({},opts.cssAfter);opts.original.animIn=$.extend({},opts.animIn);opts.original.animOut=$.extend({},opts.animOut);$.each(opts.before,function(){opts.original.before.push(this);});$.each(opts.after,function(){opts.original.after.push(this);});}function supportMultiTransitions(opts){var i,tx,txs=$.fn.cycle.transitions;if(opts.fx.indexOf(",")>0){opts.multiFx=true;opts.fxs=opts.fx.replace(/\s*/g,"").split(",");for(i=0;i<opts.fxs.length;i++){var fx=opts.fxs[i];tx=txs[fx];if(!tx||!txs.hasOwnProperty(fx)||!$.isFunction(tx)){log("discarding unknown transition: ",fx);opts.fxs.splice(i,1);i--;}}if(!opts.fxs.length){log("No valid transitions named; slideshow terminating.");return false;}}else{if(opts.fx=="all"){opts.multiFx=true;opts.fxs=[];for(p in txs){tx=txs[p];if(txs.hasOwnProperty(p)&&$.isFunction(tx)){opts.fxs.push(p);}}}}if(opts.multiFx&&opts.randomizeEffects){var r1=Math.floor(Math.random()*20)+30;for(i=0;i<r1;i++){var r2=Math.floor(Math.random()*opts.fxs.length);opts.fxs.push(opts.fxs.splice(r2,1)[0]);}debug("randomized fx sequence: ",opts.fxs);}return true;}function exposeAddSlide(opts,els){opts.addSlide=function(newSlide,prepend){var $s=$(newSlide),s=$s[0];if(!opts.autostopCount){opts.countdown++;}els[prepend?"unshift":"push"](s);if(opts.els){opts.els[prepend?"unshift":"push"](s);}opts.slideCount=els.length;$s.css("position","absolute");$s[prepend?"prependTo":"appendTo"](opts.$cont);if(prepend){opts.currSlide++;opts.nextSlide++;}if(!$.support.opacity&&opts.cleartype&&!opts.cleartypeNoBg){clearTypeFix($s);}if(opts.fit&&opts.width){$s.width(opts.width);}if(opts.fit&&opts.height&&opts.height!="auto"){$s.height(opts.height);}s.cycleH=(opts.fit&&opts.height)?opts.height:$s.height();s.cycleW=(opts.fit&&opts.width)?opts.width:$s.width();$s.css(opts.cssBefore);if(opts.pager||opts.pagerAnchorBuilder){$.fn.cycle.createPagerAnchor(els.length-1,s,$(opts.pager),els,opts);}if($.isFunction(opts.onAddSlide)){opts.onAddSlide($s);}else{$s.hide();}};}$.fn.cycle.resetState=function(opts,fx){fx=fx||opts.fx;opts.before=[];opts.after=[];opts.cssBefore=$.extend({},opts.original.cssBefore);opts.cssAfter=$.extend({},opts.original.cssAfter);opts.animIn=$.extend({},opts.original.animIn);opts.animOut=$.extend({},opts.original.animOut);opts.fxFn=null;$.each(opts.original.before,function(){opts.before.push(this);});$.each(opts.original.after,function(){opts.after.push(this);});var init=$.fn.cycle.transitions[fx];if($.isFunction(init)){init(opts.$cont,$(opts.elements),opts);}};function go(els,opts,manual,fwd){if(manual&&opts.busy&&opts.manualTrump){debug("manualTrump in go(), stopping active transition");$(els).stop(true,true);opts.busy=0;}if(opts.busy){debug("transition active, ignoring new tx request");return;}var p=opts.$cont[0],curr=els[opts.currSlide],next=els[opts.nextSlide];if(p.cycleStop!=opts.stopCount||p.cycleTimeout===0&&!manual){return;}if(!manual&&!p.cyclePause&&!opts.bounce&&((opts.autostop&&(--opts.countdown<=0))||(opts.nowrap&&!opts.random&&opts.nextSlide<opts.currSlide))){if(opts.end){opts.end(opts);}return;}var changed=false;if((manual||!p.cyclePause)&&(opts.nextSlide!=opts.currSlide)){changed=true;var fx=opts.fx;curr.cycleH=curr.cycleH||$(curr).height();curr.cycleW=curr.cycleW||$(curr).width();next.cycleH=next.cycleH||$(next).height();next.cycleW=next.cycleW||$(next).width();if(opts.multiFx){if(opts.lastFx==undefined||++opts.lastFx>=opts.fxs.length){opts.lastFx=0;}fx=opts.fxs[opts.lastFx];opts.currFx=fx;}if(opts.oneTimeFx){fx=opts.oneTimeFx;opts.oneTimeFx=null;}$.fn.cycle.resetState(opts,fx);if(opts.before.length){$.each(opts.before,function(i,o){if(p.cycleStop!=opts.stopCount){return;}o.apply(next,[curr,next,opts,fwd]);});}var after=function(){opts.busy=0;$.each(opts.after,function(i,o){if(p.cycleStop!=opts.stopCount){return;}o.apply(next,[curr,next,opts,fwd]);});};debug("tx firing("+fx+"); currSlide: "+opts.currSlide+"; nextSlide: "+opts.nextSlide);opts.busy=1;if(opts.fxFn){opts.fxFn(curr,next,opts,after,fwd,manual&&opts.fastOnEvent);}else{if($.isFunction($.fn.cycle[opts.fx])){$.fn.cycle[opts.fx](curr,next,opts,after,fwd,manual&&opts.fastOnEvent);}else{$.fn.cycle.custom(curr,next,opts,after,fwd,manual&&opts.fastOnEvent);}}}if(changed||opts.nextSlide==opts.currSlide){opts.lastSlide=opts.currSlide;if(opts.random){opts.currSlide=opts.nextSlide;if(++opts.randomIndex==els.length){opts.randomIndex=0;}opts.nextSlide=opts.randomMap[opts.randomIndex];if(opts.nextSlide==opts.currSlide){opts.nextSlide=(opts.currSlide==opts.slideCount-1)?0:opts.currSlide+1;}}else{if(opts.backwards){var roll=(opts.nextSlide-1)<0;if(roll&&opts.bounce){opts.backwards=!opts.backwards;opts.nextSlide=1;opts.currSlide=0;}else{opts.nextSlide=roll?(els.length-1):opts.nextSlide-1;opts.currSlide=roll?0:opts.nextSlide+1;}}else{var roll=(opts.nextSlide+1)==els.length;if(roll&&opts.bounce){opts.backwards=!opts.backwards;opts.nextSlide=els.length-2;opts.currSlide=els.length-1;}else{opts.nextSlide=roll?0:opts.nextSlide+1;opts.currSlide=roll?els.length-1:opts.nextSlide-1;}}}}if(changed&&opts.pager){opts.updateActivePagerLink(opts.pager,opts.currSlide,opts.activePagerClass);}var ms=0;if(opts.timeout&&!opts.continuous){ms=getTimeout(els[opts.currSlide],els[opts.nextSlide],opts,fwd);}else{if(opts.continuous&&p.cyclePause){ms=10;}}if(ms>0){p.cycleTimeout=setTimeout(function(){go(els,opts,0,!opts.backwards);},ms);}}$.fn.cycle.updateActivePagerLink=function(pager,currSlide,clsName){$(pager).each(function(){$(this).children().removeClass(clsName).eq(currSlide).addClass(clsName);});};function getTimeout(curr,next,opts,fwd){if(opts.timeoutFn){var t=opts.timeoutFn.call(curr,curr,next,opts,fwd);while(opts.fx!="none"&&(t-opts.speed)<250){t+=opts.speed;}debug("calculated timeout: "+t+"; speed: "+opts.speed);if(t!==false){return t;}}return opts.timeout;}$.fn.cycle.next=function(opts){advance(opts,1);};$.fn.cycle.prev=function(opts){advance(opts,0);};function advance(opts,moveForward){var val=moveForward?1:-1;var els=opts.elements;var p=opts.$cont[0],timeout=p.cycleTimeout;if(timeout){clearTimeout(timeout);p.cycleTimeout=0;}if(opts.random&&val<0){opts.randomIndex--;if(--opts.randomIndex==-2){opts.randomIndex=els.length-2;}else{if(opts.randomIndex==-1){opts.randomIndex=els.length-1;}}opts.nextSlide=opts.randomMap[opts.randomIndex];}else{if(opts.random){opts.nextSlide=opts.randomMap[opts.randomIndex];}else{opts.nextSlide=opts.currSlide+val;if(opts.nextSlide<0){if(opts.nowrap){return false;}opts.nextSlide=els.length-1;}else{if(opts.nextSlide>=els.length){if(opts.nowrap){return false;}opts.nextSlide=0;}}}}var cb=opts.onPrevNextEvent||opts.prevNextClick;if($.isFunction(cb)){cb(val>0,opts.nextSlide,els[opts.nextSlide]);}go(els,opts,1,moveForward);return false;}function buildPager(els,opts){var $p=$(opts.pager);$.each(els,function(i,o){$.fn.cycle.createPagerAnchor(i,o,$p,els,opts);});opts.updateActivePagerLink(opts.pager,opts.startingSlide,opts.activePagerClass);}$.fn.cycle.createPagerAnchor=function(i,el,$p,els,opts){var a;if($.isFunction(opts.pagerAnchorBuilder)){a=opts.pagerAnchorBuilder(i,el);debug("pagerAnchorBuilder("+i+", el) returned: "+a);}else{a='<a href="#">'+(i+1)+"</a>";}if(!a){return;}var $a=$(a);if($a.parents("body").length===0){var arr=[];if($p.length>1){$p.each(function(){var $clone=$a.clone(true);$(this).append($clone);arr.push($clone[0]);});$a=$(arr);}else{$a.appendTo($p);}}opts.pagerAnchors=opts.pagerAnchors||[];opts.pagerAnchors.push($a);$a.bind(opts.pagerEvent,function(e){e.preventDefault();opts.nextSlide=i;var p=opts.$cont[0],timeout=p.cycleTimeout;if(timeout){clearTimeout(timeout);p.cycleTimeout=0;}var cb=opts.onPagerEvent||opts.pagerClick;if($.isFunction(cb)){cb(opts.nextSlide,els[opts.nextSlide]);}go(els,opts,1,opts.currSlide<i);});if(!/^click/.test(opts.pagerEvent)&&!opts.allowPagerClickBubble){$a.bind("click.cycle",function(){return false;});}if(opts.pauseOnPagerHover){$a.hover(function(){opts.$cont[0].cyclePause++;},function(){opts.$cont[0].cyclePause--;});}};$.fn.cycle.hopsFromLast=function(opts,fwd){var hops,l=opts.lastSlide,c=opts.currSlide;if(fwd){hops=c>l?c-l:opts.slideCount-l;}else{hops=c<l?l-c:l+opts.slideCount-c;}return hops;};function clearTypeFix($slides){debug("applying clearType background-color hack");function hex(s){s=parseInt(s).toString(16);return s.length<2?"0"+s:s;}function getBg(e){for(;e&&e.nodeName.toLowerCase()!="html";e=e.parentNode){var v=$.css(e,"background-color");if(v&&v.indexOf("rgb")>=0){var rgb=v.match(/\d+/g);return"#"+hex(rgb[0])+hex(rgb[1])+hex(rgb[2]);}if(v&&v!="transparent"){return v;}}return"#ffffff";}$slides.each(function(){$(this).css("background-color",getBg(this));});}$.fn.cycle.commonReset=function(curr,next,opts,w,h,rev){$(opts.elements).not(curr).hide();if(typeof opts.cssBefore.opacity=="undefined"){opts.cssBefore.opacity=1;}opts.cssBefore.display="block";if(opts.slideResize&&w!==false&&next.cycleW>0){opts.cssBefore.width=next.cycleW;}if(opts.slideResize&&h!==false&&next.cycleH>0){opts.cssBefore.height=next.cycleH;}opts.cssAfter=opts.cssAfter||{};opts.cssAfter.display="none";$(curr).css("zIndex",opts.slideCount+(rev===true?1:0));$(next).css("zIndex",opts.slideCount+(rev===true?0:1));};$.fn.cycle.custom=function(curr,next,opts,cb,fwd,speedOverride){var $l=$(curr),$n=$(next);var speedIn=opts.speedIn,speedOut=opts.speedOut,easeIn=opts.easeIn,easeOut=opts.easeOut;$n.css(opts.cssBefore);if(speedOverride){if(typeof speedOverride=="number"){speedIn=speedOut=speedOverride;}else{speedIn=speedOut=1;}easeIn=easeOut=null;}var fn=function(){$n.animate(opts.animIn,speedIn,easeIn,function(){cb();});};$l.animate(opts.animOut,speedOut,easeOut,function(){$l.css(opts.cssAfter);if(!opts.sync){fn();}});if(opts.sync){fn();}};$.fn.cycle.transitions={fade:function($cont,$slides,opts){$slides.not(":eq("+opts.currSlide+")").css("opacity",0);opts.before.push(function(curr,next,opts){$.fn.cycle.commonReset(curr,next,opts);opts.cssBefore.opacity=0;});opts.animIn={opacity:1};opts.animOut={opacity:0};opts.cssBefore={top:0,left:0};}};$.fn.cycle.ver=function(){return ver;};$.fn.cycle.defaults={activePagerClass:"activeSlide",after:null,allowPagerClickBubble:false,animIn:null,animOut:null,autostop:0,autostopCount:0,backwards:false,before:null,cleartype:!$.support.opacity,cleartypeNoBg:false,containerResize:1,continuous:0,cssAfter:null,cssBefore:null,delay:0,easeIn:null,easeOut:null,easing:null,end:null,fastOnEvent:0,fit:0,fx:"fade",fxFn:null,height:"auto",manualTrump:true,next:null,nowrap:0,onPagerEvent:null,onPrevNextEvent:null,pager:null,pagerAnchorBuilder:null,pagerEvent:"click.cycle",pause:0,pauseOnPagerHover:0,prev:null,prevNextEvent:"click.cycle",random:0,randomizeEffects:1,requeueOnImageNotLoaded:true,requeueTimeout:250,rev:0,shuffle:null,slideExpr:null,slideResize:1,speed:1000,speedIn:null,speedOut:null,startingSlide:0,sync:1,timeout:4000,timeoutFn:null,updateActivePagerLink:null};})(jQuery);
\ No newline at end of file

From 119c20704fe742a545b0c7b250fd3a52c9da9730 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sat, 30 Apr 2011 20:22:06 -0600
Subject: [PATCH 15/18] progress on #24 to add i18n and wpml support

---
 404.php          | 12 ++++++------
 comments.php     | 35 +++++++++++++++++++----------------
 footer.php       |  4 ++--
 functions.php    | 20 ++++++++++----------
 header.php       |  2 --
 loop-page.php    |  2 +-
 loop-search.php  |  8 ++++----
 loop-single.php  | 11 +++++------
 loop.php         |  8 ++++----
 page-sitemap.php |  6 +++---
 search.php       |  4 ++--
 searchform.php   |  6 +++---
 12 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/404.php b/404.php
index 05f7f46..f0e7172 100644
--- a/404.php
+++ b/404.php
@@ -2,15 +2,15 @@
 		<div id="content" class="<?php echo roots_container_class; ?>">
 			<div id="main" role="main">
 				<div class="container">
-					<h1>File Not Found</h1>
+					<h1><?php _e('File Not Found', 'roots'); ?></h1>
 					<div class="error">
-						<p class="bottom">The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.</p>
+						<p class="bottom"><?php _e('The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.', 'roots'); ?></p>
 					</div>
-					<p>Please try the following:</p>
+					<p><?php _e('Please try the following:', 'roots'); ?></p>
 					<ul> 
-						<li>Check your spelling</li>
-						<li>Return to the <a href="<?php echo home_url(); ?>/">home page</a></li> 
-						<li>Click the <a href="javascript:history.back()">Back</a> button</li>
+						<li><?php _e('Check your spelling', 'roots'); ?> </li>
+						<li><?php printf(__('Return to the <a href="%s">home page</a>', 'roots'), home_url()); ?></li>
+						<li><?php _e('Click the <a href="javascript:history.back()">Back</a> button', 'roots'); ?></li>
 					</ul>
 				</div>
 			</div><!-- /#main -->
diff --git a/comments.php b/comments.php
index 7632e36..bd6a83c 100644
--- a/comments.php
+++ b/comments.php
@@ -4,14 +4,14 @@
 		<article id="comment-<?php comment_ID(); ?>">
 			<header class="comment-author vcard">
 				<?php echo get_avatar($comment,$size='32'); ?>
-				<?php printf(__('<cite class="fn">%s</cite>'), get_comment_author_link()) ?>
-				<time datetime="<?php echo comment_date('c') ?>"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s'), get_comment_date(),  get_comment_time()) ?></a></time>
-				<?php edit_comment_link(__('(Edit)'),'  ','') ?>
+				<?php printf(__('<cite class="fn">%s</cite>', 'roots'), get_comment_author_link()) ?>
+				<time datetime="<?php echo comment_date('c') ?>"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s', 'roots'), get_comment_date(),  get_comment_time()) ?></a></time>
+				<?php edit_comment_link(__('(Edit)', 'roots'), '', '') ?>
 			</header>
 
 			<?php if ($comment->comment_approved == '0') : ?>
        			<div class="notice">
-          			<p class="bottom"><?php _e('Your comment is awaiting moderation.') ?></p>
+					<p class="bottom"><?php _e('Your comment is awaiting moderation.', 'roots') ?></p>
           		</div>
           		
 			<?php endif; ?>
@@ -28,12 +28,12 @@
 <?php
 // Do not delete these lines
 	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die ('Please do not load this page directly. Thanks!');
+		die (__('Please do not load this page directly. Thanks!', 'roots'));
 
 	if ( post_password_required() ) { ?>
 	<section id="comments">
 		<div class="notice">
-			<p class="bottom">This post is password protected. Enter the password to view comments.</p>
+			<p class="bottom"><?php _e('This post is password protected. Enter the password to view comments.', 'roots'); ?></p>
 		</div>
 	</section>
 	<?php
@@ -43,7 +43,7 @@
 <?php // You can start editing here. ?>
 <?php if ( have_comments() ) : ?>
 	<section id="comments">
-		<h3><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
+		<h3><?php comments_number(__('No Responses to', 'roots'), __('One Response to', 'roots'), __('% Responses to', 'roots') ); ?> &#8220;<?php the_title(); ?>&#8221;</h3>
 		<ol class="commentlist">
 		<?php wp_list_comments('type=comment&callback=roots_comments'); ?>
 		<?php // wp_list_comments(); ?>
@@ -60,37 +60,40 @@
 	<?php else : // comments are closed ?>
 	<section id="comments">
 		<div class="notice">
-			<p class="bottom">Comments are closed.</p>
+			<p class="bottom"><?php _e('Comments are closed.', 'roots') ?></p>
 		</div>
 	</section>
 	<?php endif; ?>
 <?php endif; ?>
 <?php if ( comments_open() ) : ?>
 <section id="respond">
-	<h3><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
+	<h3><?php comment_form_title( __('Leave a Reply', 'roots'), __('Leave a Reply to %s', 'roots') ); ?></h3>
 	<p class="cancel-comment-reply"><?php cancel_comment_reply_link(); ?></p>
 	<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
-	<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
+	<p><?php printf( __('You must be <a href="%s">logged in</a> to post a comment.', 'roots'), wp_login_url( get_permalink() ) ); ?></p>
 	<?php else : ?>
 	<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 		<?php if ( is_user_logged_in() ) : ?>
-		<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+		<p><?php printf(__('Logged in as <a href="%s"/wp-admin/profile.php">%s</a>.', 'roots'), get_option('siteurl'), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php __('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a></p>
 		<?php else : ?>
 		<p>
-			<label for="author">Name <?php if ($req) echo "(required)"; ?></label>
+			<label for="author"><?php _e('Name', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
 			<input type="text" class="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?>>
 		</p>
 		<p>
-			<label for="email">Email (will not be published) <?php if ($req) echo "(required)"; ?></label>
+			<label for="email"><?php _e('Email (will not be published)', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
 			<input type="email" class="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?>>
 		</p>
 		<p>
-			<label for="url">Website</label>
+			<label for="url"><?php _e('Website', 'roots'); ?></label>
 			<input type="url" class="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3">
 		</p>
 		<?php endif; ?>
-		<p><textarea name="comment" id="comment" rows="10" tabindex="4"></textarea></p>
-		<p><input name="submit" class="button" type="submit" id="submit" tabindex="5" value="Submit Comment"></p>
+		<p>
+			<label for="comment"><?php _e('Comment', 'roots'); ?></label>
+			<textarea name="comment" id="comment" tabindex="4"></textarea>
+		</p>
+		<p><input name="submit" class="button" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'roots'); ?>"></p>
 		<?php comment_id_fields(); ?>
 		<?php do_action('comment_form', $post->ID); ?>
 	</form>
diff --git a/footer.php b/footer.php
index 1798a20..3a02228 100644
--- a/footer.php
+++ b/footer.php
@@ -10,13 +10,13 @@
 				<p class="copy"><small>&copy; <?php echo date('Y'); ?> <?php bloginfo('name'); ?></small></p>
 				<?php if (get_option('roots_footer_social_share') == 'checked') { ?>
 				<p class="social">
-					<a href="http://twitter.com/share" class="twitter-share-button" data-url="<?php echo home_url('/'); ?>" data-count="horizontal">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+					<a href="http://twitter.com/share" class="twitter-share-button" data-url="<?php echo home_url('/'); ?>" data-count="horizontal"><?php _e('Tweet', 'roots');?></a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
 					<iframe src="http://www.facebook.com/plugins/like.php?href=<?php echo home_url('/'); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=110&amp;action=like&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:110px; height:21px;" allowTransparency="true"></iframe>
 				</p>
 				<?php } ?>
 				<?php if (get_option('roots_footer_vcard') == 'checked') { ?>
 				<p class="vcard">
-					<a class="fn org url" href="<?php echo home_url('/'); ?>" title="Contact Information for <?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a><br>
+					<a class="fn org url" href="<?php echo home_url('/'); ?>"><?php bloginfo('name'); ?></a><br>
 					<span class="adr">
 						<span class="street-address"><?php echo get_option('roots_vcard_street-address'); ?></span><br>
 						<span class="locality"><?php echo get_option('roots_vcard_locality'); ?></span>,
diff --git a/functions.php b/functions.php
index 7348052..3be8cd7 100644
--- a/functions.php
+++ b/functions.php
@@ -36,7 +36,7 @@ if (!defined('roots_container_class')) {
 }
 
 function get_roots_stylesheets() {
-  $roots_css_framework = get_option('roots_css_framework');
+	$roots_css_framework = get_option('roots_css_framework');
 	$template_uri = get_template_directory_uri();
 	$styles = '';
 
@@ -71,25 +71,25 @@ function get_roots_stylesheets() {
 	
 // set the maximum 'Large' image width to the maximum grid width
 if (!isset($content_width)) {
-  switch ($roots_css_framework) {
+	switch ($roots_css_framework) {
     case 'blueprint':
 		  $content_width = 950;
-      break;
+	break;
     case '960gs_12':
 		  $content_width = 940;
-      break;
+	break;
     case '960gs_16':
 		  $content_width = 940;
-      break;
+	break;
     case '960gs_24':
 		  $content_width = 940;
-      break;
+	break;
     case '1140':
 		  $content_width = 1140;
-      break;
+	break;
     default:
 		  $content_width = 950;
-      break;
+	break;
   }
 }
 // tell the TinyMCE editor to use editor-style.css
@@ -105,8 +105,8 @@ add_theme_support('post-thumbnails');
 add_theme_support('menus');
 register_nav_menus(
 	array(
-	  'primary_navigation' => 'Primary Navigation',
-	  'utility_navigation' => 'Utility Navigation'
+		'primary_navigation' => 'Primary Navigation',
+		'utility_navigation' => 'Utility Navigation'
 	)
 );
 
diff --git a/header.php b/header.php
index bc80a6c..0f11742 100644
--- a/header.php
+++ b/header.php
@@ -50,7 +50,5 @@
 		</header>
 	<?php if (get_option('roots_css_framework') === '1140') { ?>
 		</div><!-- /.row -->
-	<?php } ?>
-	<?php if (get_option('roots_css_framework') === '1140') { ?>
 		<div class="row">
 	<?php } ?>
diff --git a/loop-page.php b/loop-page.php
index 43c9c84..60feefe 100644
--- a/loop-page.php
+++ b/loop-page.php
@@ -1,5 +1,5 @@
 <?php /* Start loop */ ?>
-<?php while (have_posts()) : the_post();  ?>
+<?php while (have_posts()) : the_post(); ?>
 
 	<?php if (function_exists('yoast_breadcrumb')) { if (is_page() && $post->post_parent) { yoast_breadcrumb('<p id="breadcrumbs">','</p>'); } } ?>
 	<h1><?php the_title(); ?></h1>
diff --git a/loop-search.php b/loop-search.php
index 3e26189..29f4733 100644
--- a/loop-search.php
+++ b/loop-search.php
@@ -1,22 +1,22 @@
 <?php /* If there are no posts to display, such as an empty archive page */ ?>
 <?php if (!have_posts()) : ?>
 	<div class="notice">
-		<p class="bottom">Sorry, no results were found.</p>
+		<p class="bottom"><?php _e('Sorry, no results were found.', 'roots'); ?></p>
 	</div>
 	<?php get_search_form(); ?>	
 	
 <?php endif; ?>
 
 <?php /* Start loop */ ?>
-<?php while (have_posts()) : the_post();  ?>
+<?php while (have_posts()) : the_post(); ?>
 
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<header>
 				<h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-				<time pubdate datetime="<?php the_time('c'); ?>">Posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>.</time>
+				<time pubdate datetime="<?php the_time('c'); ?>"><?php printf(__('Posted on %s at %s.', 'roots'), get_the_time('l, F jS, Y'), get_the_time()); ?></time>
 				<?php if (get_option('roots_post_author') == 'checked') { ?>
 				<p class="byline author vcard">
-					Written by <span class="fn"><?php the_author(); ?></span>
+					<?php _e('Written by', 'roots');?> <span class="fn"><?php the_author(); ?></span>
 				</p>
 				<?php } ?>
 			</header>
diff --git a/loop-single.php b/loop-single.php
index dc4a65c..37be735 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -1,21 +1,21 @@
 <?php /* Start loop */ ?>
-<?php while (have_posts()) : the_post();  ?>
+<?php while (have_posts()) : the_post(); ?>
 
 	<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
 		<header>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
-			<time class="updated" datetime="<?php the_time('c'); ?>" pubdate>Posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>.</time>
+			<time class="updated" datetime="<?php the_time('c'); ?>" pubdate><?php printf(__('Posted on %s at %s.', 'roots'), get_the_time('l, F jS, Y'),get_the_time())?></time>
 			<?php if (get_option('roots_post_author') == 'checked') { ?>
 			<p class="byline author vcard">
-				Written by <span class="fn"><?php the_author(); ?></span>
+				<?php _e('Written by', 'roots');?> <span class="fn"><?php the_author(); ?></span>
 			</p>
 			<?php } ?>
 			<?php if (get_option('roots_post_tweet') == 'checked') { ?>
-			<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+			<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal"><?php _e('Tweet', 'roots');?></a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
 			<?php } ?>
 		</header>
 		<div class="entry-content">
-			<?php the_content('<p>Read the rest of this entry &raquo;</p>'); ?>
+			<?php the_content('<p>'.__('Read the rest of this entry &raquo;', 'roots').'</p>'); ?>
 		</div>
 		<footer>
 			<?php wp_link_pages(array('before' => '<nav id="page-nav"><p>' . __('Pages:', 'roots'), 'after' => '</p></nav>' )); ?>
@@ -25,4 +25,3 @@
 	</article>
 
 <?php endwhile; // End the loop ?>
-
diff --git a/loop.php b/loop.php
index 3e26189..af71143 100644
--- a/loop.php
+++ b/loop.php
@@ -1,22 +1,22 @@
 <?php /* If there are no posts to display, such as an empty archive page */ ?>
 <?php if (!have_posts()) : ?>
 	<div class="notice">
-		<p class="bottom">Sorry, no results were found.</p>
+		<p class="bottom"><?php _e('Sorry, no results were found.', 'roots'); ?></p>
 	</div>
 	<?php get_search_form(); ?>	
 	
 <?php endif; ?>
 
 <?php /* Start loop */ ?>
-<?php while (have_posts()) : the_post();  ?>
+<?php while (have_posts()) : the_post(); ?>
 
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<header>
 				<h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-				<time pubdate datetime="<?php the_time('c'); ?>">Posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>.</time>
+				<time pubdate datetime="<?php the_time('c'); ?>"><?php printf( __('Posted on %s at %s.','roots'), get_the_time('l, F jS, Y'), get_the_time()) ?></time>
 				<?php if (get_option('roots_post_author') == 'checked') { ?>
 				<p class="byline author vcard">
-					Written by <span class="fn"><?php the_author(); ?></span>
+					<?php _e('Written by', 'roots');?> <span class="fn"><?php the_author(); ?></span>
 				</p>
 				<?php } ?>
 			</header>
diff --git a/page-sitemap.php b/page-sitemap.php
index e773d28..c9b6f2d 100644
--- a/page-sitemap.php
+++ b/page-sitemap.php
@@ -7,11 +7,11 @@ get_header(); ?>
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
-					<h2>Pages</h2>
+					<h2><?php _e('Pages', 'roots'); ?></h2>
 					<ul><?php wp_list_pages('sort_column=menu_order&depth=0&title_li='); ?></ul>
-					<h2>Posts</h2>
+					<h2><?php _e('Posts', 'roots'); ?></h2>
 					<ul><?php wp_list_categories('title_li=&hierarchical=0&show_count=1'); ?></ul>
-					<h2>Archives</h2>
+					<h2><?php _e('Archives', 'roots'); ?></h2>
 					<ul><?php wp_get_archives('type=monthly&limit=12'); ?></ul>
 				</div>
 			</div><!-- /#main -->
diff --git a/search.php b/search.php
index bb9ddd8..7b5c699 100644
--- a/search.php
+++ b/search.php
@@ -2,7 +2,7 @@
 		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>">
 				<div class="container">
-					<h1>Search Results for <?php echo get_search_query(); ?></h1>				
+					<h1><?php _e('Search Results for', 'roots'); ?> <?php echo get_search_query(); ?></h1>				
 					<?php get_template_part('loop', 'search'); ?>
 				</div>
 			</div><!-- /#main -->
@@ -12,4 +12,4 @@
 				</div>
 			</aside><!-- /#sidebar -->
 		</div><!-- /#content -->
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/searchform.php b/searchform.php
index 702e135..2c82c2c 100644
--- a/searchform.php
+++ b/searchform.php
@@ -1,5 +1,5 @@
 <form role="search" method="get" id="searchform" action="<?php echo home_url('/'); ?>">
-	<label class="visuallyhidden" for="s">Search for:</label>
-	<input type="search" value="" name="s" id="s" placeholder="Search <?php bloginfo('name'); ?>">
-	<input type="submit" id="searchsubmit" value="Search" class="button">
+	<label class="visuallyhidden" for="s"><?php _e('Search for:', 'roots'); ?></label>
+	<input type="search" value="" name="s" id="s" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+	<input type="submit" id="searchsubmit" value="<?php _e('Search', 'roots'); ?>" class="button">
 </form>
\ No newline at end of file

From 94e47c327915062d4ef0079dbf9de504da900cfd Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sat, 30 Apr 2011 20:32:40 -0600
Subject: [PATCH 16/18] fixes #40

---
 includes/roots-options.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/roots-options.php b/includes/roots-options.php
index 97a08de..76d52a5 100644
--- a/includes/roots-options.php
+++ b/includes/roots-options.php
@@ -4,7 +4,9 @@
 add_action('admin_menu', 'roots_create_menu');
 
 function roots_create_menu() {
-	$icon = get_template_directory_uri() . '/includes/img/icon-roots.png';
+	$home_url = home_url();
+	$theme_name = next(explode('/themes/', get_template_directory()));
+	$icon = "$home_url/wp-content/themes/$theme_name/includes/img/icon-roots.png";
 
 	// create menu
 	$theme_name = get_current_theme();

From fc6ebd0a020ec8bc2e6bd16bbb93724978ea9410 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sun, 1 May 2011 10:06:08 -0600
Subject: [PATCH 17/18] minor text/formatting changes

---
 README.md                  | 5 +++--
 includes/roots-cleanup.php | 8 ++++----
 style.css                  | 7 +++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 180c0e5..7e83a75 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,8 @@
 	<li>Added Blueprint CSS to Starkers</li>
 </ul>
 
-## Contributors
+## Contributors:
+
 [Scott Walkinshaw](http://www.scottwalkinshaw.com/), [Matthew Price](http://www.matthewaprice.com/), [Kyle Geminden](http://www.kylegeminden.com/), [Steve Jothen](http://twitter.com/sjothen), [John Liuti](http://twitter.com/JohnLiuti), [Jeremiah Wall](http://jeremiahwall.com/), [Jenny Jui-Shan Liang](http://jsliang.twgogo.org/)
 
 ## License:
@@ -143,4 +144,4 @@ Everything else:
 
 ## Summary:
 
-Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS (or 960.gs) and Starkers that will help you rapidly create brochure sites and blogs.
+Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS/960 Grid System/1140 Grid and Starkers that will help you rapidly create brochure sites and blogs.
\ No newline at end of file
diff --git a/includes/roots-cleanup.php b/includes/roots-cleanup.php
index 4594086..96336ab 100644
--- a/includes/roots-cleanup.php
+++ b/includes/roots-cleanup.php
@@ -15,7 +15,7 @@ function roots_flush_rewrites() {
 }
 
 function roots_add_rewrites($content) {
-  $theme_name = next(explode('/themes/', get_stylesheet_directory()));
+	$theme_name = next(explode('/themes/', get_stylesheet_directory()));
 	global $wp_rewrite;
 	$roots_new_non_wp_rules = array(
 		'css/(.*)'      => 'wp-content/themes/'. $theme_name . '/css/$1',
@@ -70,7 +70,7 @@ function roots_root_relative_url($input) {
 	return str_replace(end($matches), '', $input);
 }
 
-//add_filter('site_url', 'roots_root_relative_url'); // this will break URLs sent out in emails, possibly more
+
 add_filter('bloginfo_url', 'roots_root_relative_url');
 add_filter('theme_root_uri', 'roots_root_relative_url');
 add_filter('stylesheet_directory_uri', 'roots_root_relative_url');
@@ -90,7 +90,7 @@ add_filter('month_link', 'roots_root_relative_url');
 add_filter('day_link', 'roots_root_relative_url');
 add_filter('year_link', 'roots_root_relative_url');
 add_filter('tag_link', 'roots_root_relative_url');
-// add_filter('post_link', 'roots_root_relative_url');
+
 
 // remove root relative URLs on any attachments in the feed
 function roots_relative_feed_urls() {
@@ -148,7 +148,7 @@ function roots_head_cleanup() {
 	add_action('wp_head', 'roots_noindex');
 	
 	remove_action('wp_head', 'rel_canonical');	
-		function roots_rel_canonical() {
+	function roots_rel_canonical() {
 		if (!is_singular())
 			return;
 		global $wp_the_query;
diff --git a/style.css b/style.css
index 66fc0a1..de03419 100644
--- a/style.css
+++ b/style.css
@@ -1,12 +1,11 @@
 /*
 Theme Name:         Roots
-Theme URI:          http://www.rootstheme.com/
-Description:        Starting theme based on HTML5 Boilerplate, Blueprint CSS and Starkers
+Theme URI:          http://rootstheme.com/
+Description:        Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate, Blueprint CSS/960 Grid System/1140 Grid and Starkers that will help you rapidly create brochure sites and blogs.
 Version:            3.2.2
 Author:             Ben Word
 Author URI:         http://benword.com/
-Tags:               roots, boilerplate, blueprint, starkers
 
 License:            The Unlicense
 License URI:        http://unlicense.org/
-*/
+*/
\ No newline at end of file

From 29dbefc28744dd141c549e268b86a96993ada916 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sun, 1 May 2011 10:23:44 -0600
Subject: [PATCH 18/18] -moz-appearance and -webkit-appearance: textfield were
 on the search button instead of the search input

---
 css/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/css/style.css b/css/style.css
index 6e50d28..729782a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -395,8 +395,7 @@ img.ui-datepicker-trigger { vertical-align: middle; }
 #mapp0_poweredby, #mapp1_poweredby, #mapp2_poweredby, #mapp3_poweredby, #mapp4_poweredby, #mapp5_poweredby, #mapp6_poweredby, #mapp7_poweredby, #mapp8_poweredby, #mapp9_poweredby, #mapp10_poweredby { display: none !important; } /* remove MapPress credit */
 
 /* Search */
-#searchform #s { padding: 5px; }
-#searchform #searchsubmit { -moz-appearance: textfield; -webkit-appearance: textfield; }
+#searchform #s { padding: 5px; -moz-appearance: textfield; -webkit-appearance: textfield; }
 
 
 /* INTERNET EXPLORER