adding support for 960.gs

404.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
+		<div id="content" class="<?php echo roots_container_class; ?>">
 			<div id="main" role="main">
 				<div class="container">
 					<h1>File Not Found</h1>

README.md

@@ -2,6 +2,17 @@
 
 ## Changelog:
 
+### 3.1.0: April 1st, 2011
+
+<ul>
+	<li>Added support for 960.gs thanks to John Liuti</li>
+	<li>Added more onto the <code>.htaccess</code> from HTML5 Boilerplate</li>
+	<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>
@@ -98,6 +109,7 @@ Major components:
 
 * HTML5 Boileplate: [The Unlicense](http://unlicense.org)
 * Blueprint CSS: Modified MIT License
+* 960 Grid System: MIT/GPL license
 * Modernizr: MIT/BSD license
 * jQuery: MIT/GPL license
 

archive.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<h1><?php single_cat_title(); ?></h1>
@@ -11,6 +11,5 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

css/960/960.css

@@ -0,0 +1,643 @@
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/*
+  Forces backgrounds to span full width,
+  even if there is horizontal scrolling.
+  Increase this if your layout is wider.
+
+  Note: IE6 works fine without this fix.
+*/
+
+body {
+  min-width: 960px;
+}
+
+/* `Containers
+----------------------------------------------------------------------------------------------------*/
+
+.container_12,
+.container_16 {
+  margin-left: auto;
+  margin-right: auto;
+  width: 960px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16 {
+  display: inline;
+  float: left;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.push_1, .pull_1,
+.push_2, .pull_2,
+.push_3, .pull_3,
+.push_4, .pull_4,
+.push_5, .pull_5,
+.push_6, .pull_6,
+.push_7, .pull_7,
+.push_8, .pull_8,
+.push_9, .pull_9,
+.push_10, .pull_10,
+.push_11, .pull_11,
+.push_12, .pull_12,
+.push_13, .pull_13,
+.push_14, .pull_14,
+.push_15, .pull_15 {
+  position: relative;
+}
+
+.container_12 .grid_3,
+.container_16 .grid_4 {
+  width: 220px;
+}
+
+.container_12 .grid_6,
+.container_16 .grid_8 {
+  width: 460px;
+}
+
+.container_12 .grid_9,
+.container_16 .grid_12 {
+  width: 700px;
+}
+
+.container_12 .grid_12,
+.container_16 .grid_16 {
+  width: 940px;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-left: 0;
+}
+
+.omega {
+  margin-right: 0;
+}
+
+/* `Grid >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .grid_1 {
+  width: 60px;
+}
+
+.container_12 .grid_2 {
+  width: 140px;
+}
+
+.container_12 .grid_4 {
+  width: 300px;
+}
+
+.container_12 .grid_5 {
+  width: 380px;
+}
+
+.container_12 .grid_7 {
+  width: 540px;
+}
+
+.container_12 .grid_8 {
+  width: 620px;
+}
+
+.container_12 .grid_10 {
+  width: 780px;
+}
+
+.container_12 .grid_11 {
+  width: 860px;
+}
+
+/* `Grid >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .grid_1 {
+  width: 40px;
+}
+
+.container_16 .grid_2 {
+  width: 100px;
+}
+
+.container_16 .grid_3 {
+  width: 160px;
+}
+
+.container_16 .grid_5 {
+  width: 280px;
+}
+
+.container_16 .grid_6 {
+  width: 340px;
+}
+
+.container_16 .grid_7 {
+  width: 400px;
+}
+
+.container_16 .grid_9 {
+  width: 520px;
+}
+
+.container_16 .grid_10 {
+  width: 580px;
+}
+
+.container_16 .grid_11 {
+  width: 640px;
+}
+
+.container_16 .grid_13 {
+  width: 760px;
+}
+
+.container_16 .grid_14 {
+  width: 820px;
+}
+
+.container_16 .grid_15 {
+  width: 880px;
+}
+
+/* `Prefix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_3,
+.container_16 .prefix_4 {
+  padding-left: 240px;
+}
+
+.container_12 .prefix_6,
+.container_16 .prefix_8 {
+  padding-left: 480px;
+}
+
+.container_12 .prefix_9,
+.container_16 .prefix_12 {
+  padding-left: 720px;
+}
+
+/* `Prefix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_1 {
+  padding-left: 80px;
+}
+
+.container_12 .prefix_2 {
+  padding-left: 160px;
+}
+
+.container_12 .prefix_4 {
+  padding-left: 320px;
+}
+
+.container_12 .prefix_5 {
+  padding-left: 400px;
+}
+
+.container_12 .prefix_7 {
+  padding-left: 560px;
+}
+
+.container_12 .prefix_8 {
+  padding-left: 640px;
+}
+
+.container_12 .prefix_10 {
+  padding-left: 800px;
+}
+
+.container_12 .prefix_11 {
+  padding-left: 880px;
+}
+
+/* `Prefix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .prefix_1 {
+  padding-left: 60px;
+}
+
+.container_16 .prefix_2 {
+  padding-left: 120px;
+}
+
+.container_16 .prefix_3 {
+  padding-left: 180px;
+}
+
+.container_16 .prefix_5 {
+  padding-left: 300px;
+}
+
+.container_16 .prefix_6 {
+  padding-left: 360px;
+}
+
+.container_16 .prefix_7 {
+  padding-left: 420px;
+}
+
+.container_16 .prefix_9 {
+  padding-left: 540px;
+}
+
+.container_16 .prefix_10 {
+  padding-left: 600px;
+}
+
+.container_16 .prefix_11 {
+  padding-left: 660px;
+}
+
+.container_16 .prefix_13 {
+  padding-left: 780px;
+}
+
+.container_16 .prefix_14 {
+  padding-left: 840px;
+}
+
+.container_16 .prefix_15 {
+  padding-left: 900px;
+}
+
+/* `Suffix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_3,
+.container_16 .suffix_4 {
+  padding-right: 240px;
+}
+
+.container_12 .suffix_6,
+.container_16 .suffix_8 {
+  padding-right: 480px;
+}
+
+.container_12 .suffix_9,
+.container_16 .suffix_12 {
+  padding-right: 720px;
+}
+
+/* `Suffix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_1 {
+  padding-right: 80px;
+}
+
+.container_12 .suffix_2 {
+  padding-right: 160px;
+}
+
+.container_12 .suffix_4 {
+  padding-right: 320px;
+}
+
+.container_12 .suffix_5 {
+  padding-right: 400px;
+}
+
+.container_12 .suffix_7 {
+  padding-right: 560px;
+}
+
+.container_12 .suffix_8 {
+  padding-right: 640px;
+}
+
+.container_12 .suffix_10 {
+  padding-right: 800px;
+}
+
+.container_12 .suffix_11 {
+  padding-right: 880px;
+}
+
+/* `Suffix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .suffix_1 {
+  padding-right: 60px;
+}
+
+.container_16 .suffix_2 {
+  padding-right: 120px;
+}
+
+.container_16 .suffix_3 {
+  padding-right: 180px;
+}
+
+.container_16 .suffix_5 {
+  padding-right: 300px;
+}
+
+.container_16 .suffix_6 {
+  padding-right: 360px;
+}
+
+.container_16 .suffix_7 {
+  padding-right: 420px;
+}
+
+.container_16 .suffix_9 {
+  padding-right: 540px;
+}
+
+.container_16 .suffix_10 {
+  padding-right: 600px;
+}
+
+.container_16 .suffix_11 {
+  padding-right: 660px;
+}
+
+.container_16 .suffix_13 {
+  padding-right: 780px;
+}
+
+.container_16 .suffix_14 {
+  padding-right: 840px;
+}
+
+.container_16 .suffix_15 {
+  padding-right: 900px;
+}
+
+/* `Push Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_3,
+.container_16 .push_4 {
+  left: 240px;
+}
+
+.container_12 .push_6,
+.container_16 .push_8 {
+  left: 480px;
+}
+
+.container_12 .push_9,
+.container_16 .push_12 {
+  left: 720px;
+}
+
+/* `Push Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_1 {
+  left: 80px;
+}
+
+.container_12 .push_2 {
+  left: 160px;
+}
+
+.container_12 .push_4 {
+  left: 320px;
+}
+
+.container_12 .push_5 {
+  left: 400px;
+}
+
+.container_12 .push_7 {
+  left: 560px;
+}
+
+.container_12 .push_8 {
+  left: 640px;
+}
+
+.container_12 .push_10 {
+  left: 800px;
+}
+
+.container_12 .push_11 {
+  left: 880px;
+}
+
+/* `Push Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .push_1 {
+  left: 60px;
+}
+
+.container_16 .push_2 {
+  left: 120px;
+}
+
+.container_16 .push_3 {
+  left: 180px;
+}
+
+.container_16 .push_5 {
+  left: 300px;
+}
+
+.container_16 .push_6 {
+  left: 360px;
+}
+
+.container_16 .push_7 {
+  left: 420px;
+}
+
+.container_16 .push_9 {
+  left: 540px;
+}
+
+.container_16 .push_10 {
+  left: 600px;
+}
+
+.container_16 .push_11 {
+  left: 660px;
+}
+
+.container_16 .push_13 {
+  left: 780px;
+}
+
+.container_16 .push_14 {
+  left: 840px;
+}
+
+.container_16 .push_15 {
+  left: 900px;
+}
+
+/* `Pull Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_3,
+.container_16 .pull_4 {
+  left: -240px;
+}
+
+.container_12 .pull_6,
+.container_16 .pull_8 {
+  left: -480px;
+}
+
+.container_12 .pull_9,
+.container_16 .pull_12 {
+  left: -720px;
+}
+
+/* `Pull Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_1 {
+  left: -80px;
+}
+
+.container_12 .pull_2 {
+  left: -160px;
+}
+
+.container_12 .pull_4 {
+  left: -320px;
+}
+
+.container_12 .pull_5 {
+  left: -400px;
+}
+
+.container_12 .pull_7 {
+  left: -560px;
+}
+
+.container_12 .pull_8 {
+  left: -640px;
+}
+
+.container_12 .pull_10 {
+  left: -800px;
+}
+
+.container_12 .pull_11 {
+  left: -880px;
+}
+
+/* `Pull Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .pull_1 {
+  left: -60px;
+}
+
+.container_16 .pull_2 {
+  left: -120px;
+}
+
+.container_16 .pull_3 {
+  left: -180px;
+}
+
+.container_16 .pull_5 {
+  left: -300px;
+}
+
+.container_16 .pull_6 {
+  left: -360px;
+}
+
+.container_16 .pull_7 {
+  left: -420px;
+}
+
+.container_16 .pull_9 {
+  left: -540px;
+}
+
+.container_16 .pull_10 {
+  left: -600px;
+}
+
+.container_16 .pull_11 {
+  left: -660px;
+}
+
+.container_16 .pull_13 {
+  left: -780px;
+}
+
+.container_16 .pull_14 {
+  left: -840px;
+}
+
+.container_16 .pull_15 {
+  left: -900px;
+}
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
+
+.clearfix:before,
+.clearfix:after {
+  content: '\0020';
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+/*
+  The following zoom:1 rule is specifically for IE6 + IE7.
+  Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+.clearfix {
+  zoom: 1;
+}

css/960/960_24_col.css

@@ -0,0 +1,614 @@
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/*
+  Forces backgrounds to span full width,
+  even if there is horizontal scrolling.
+  Increase this if your layout is wider.
+
+  Note: IE6 works fine without this fix.
+*/
+
+body {
+  min-width: 960px;
+}
+
+/* `Container >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+.container_24 {
+  margin-left: auto;
+  margin-right: auto;
+  width: 960px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16,
+.grid_17,
+.grid_18,
+.grid_19,
+.grid_20,
+.grid_21,
+.grid_22,
+.grid_23,
+.grid_24 {
+  display: inline;
+  float: left;
+  margin-left: 5px;
+  margin-right: 5px;
+}
+
+.push_1, .pull_1,
+.push_2, .pull_2,
+.push_3, .pull_3,
+.push_4, .pull_4,
+.push_5, .pull_5,
+.push_6, .pull_6,
+.push_7, .pull_7,
+.push_8, .pull_8,
+.push_9, .pull_9,
+.push_10, .pull_10,
+.push_11, .pull_11,
+.push_12, .pull_12,
+.push_13, .pull_13,
+.push_14, .pull_14,
+.push_15, .pull_15,
+.push_16, .pull_16,
+.push_17, .pull_17,
+.push_18, .pull_18,
+.push_19, .pull_19,
+.push_20, .pull_20,
+.push_21, .pull_21,
+.push_22, .pull_22,
+.push_23, .pull_23 {
+  position: relative;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-left: 0;
+}
+
+.omega {
+  margin-right: 0;
+}
+
+/* `Grid >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .grid_1 {
+  width: 30px;
+}
+
+.container_24 .grid_2 {
+  width: 70px;
+}
+
+.container_24 .grid_3 {
+  width: 110px;
+}
+
+.container_24 .grid_4 {
+  width: 150px;
+}
+
+.container_24 .grid_5 {
+  width: 190px;
+}
+
+.container_24 .grid_6 {
+  width: 230px;
+}
+
+.container_24 .grid_7 {
+  width: 270px;
+}
+
+.container_24 .grid_8 {
+  width: 310px;
+}
+
+.container_24 .grid_9 {
+  width: 350px;
+}
+
+.container_24 .grid_10 {
+  width: 390px;
+}
+
+.container_24 .grid_11 {
+  width: 430px;
+}
+
+.container_24 .grid_12 {
+  width: 470px;
+}
+
+.container_24 .grid_13 {
+  width: 510px;
+}
+
+.container_24 .grid_14 {
+  width: 550px;
+}
+
+.container_24 .grid_15 {
+  width: 590px;
+}
+
+.container_24 .grid_16 {
+  width: 630px;
+}
+
+.container_24 .grid_17 {
+  width: 670px;
+}
+
+.container_24 .grid_18 {
+  width: 710px;
+}
+
+.container_24 .grid_19 {
+  width: 750px;
+}
+
+.container_24 .grid_20 {
+  width: 790px;
+}
+
+.container_24 .grid_21 {
+  width: 830px;
+}
+
+.container_24 .grid_22 {
+  width: 870px;
+}
+
+.container_24 .grid_23 {
+  width: 910px;
+}
+
+.container_24 .grid_24 {
+  width: 950px;
+}
+
+/* `Prefix Extra Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .prefix_1 {
+  padding-left: 40px;
+}
+
+.container_24 .prefix_2 {
+  padding-left: 80px;
+}
+
+.container_24 .prefix_3 {
+  padding-left: 120px;
+}
+
+.container_24 .prefix_4 {
+  padding-left: 160px;
+}
+
+.container_24 .prefix_5 {
+  padding-left: 200px;
+}
+
+.container_24 .prefix_6 {
+  padding-left: 240px;
+}
+
+.container_24 .prefix_7 {
+  padding-left: 280px;
+}
+
+.container_24 .prefix_8 {
+  padding-left: 320px;
+}
+
+.container_24 .prefix_9 {
+  padding-left: 360px;
+}
+
+.container_24 .prefix_10 {
+  padding-left: 400px;
+}
+
+.container_24 .prefix_11 {
+  padding-left: 440px;
+}
+
+.container_24 .prefix_12 {
+  padding-left: 480px;
+}
+
+.container_24 .prefix_13 {
+  padding-left: 520px;
+}
+
+.container_24 .prefix_14 {
+  padding-left: 560px;
+}
+
+.container_24 .prefix_15 {
+  padding-left: 600px;
+}
+
+.container_24 .prefix_16 {
+  padding-left: 640px;
+}
+
+.container_24 .prefix_17 {
+  padding-left: 680px;
+}
+
+.container_24 .prefix_18 {
+  padding-left: 720px;
+}
+
+.container_24 .prefix_19 {
+  padding-left: 760px;
+}
+
+.container_24 .prefix_20 {
+  padding-left: 800px;
+}
+
+.container_24 .prefix_21 {
+  padding-left: 840px;
+}
+
+.container_24 .prefix_22 {
+  padding-left: 880px;
+}
+
+.container_24 .prefix_23 {
+  padding-left: 920px;
+}
+
+/* `Suffix Extra Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .suffix_1 {
+  padding-right: 40px;
+}
+
+.container_24 .suffix_2 {
+  padding-right: 80px;
+}
+
+.container_24 .suffix_3 {
+  padding-right: 120px;
+}
+
+.container_24 .suffix_4 {
+  padding-right: 160px;
+}
+
+.container_24 .suffix_5 {
+  padding-right: 200px;
+}
+
+.container_24 .suffix_6 {
+  padding-right: 240px;
+}
+
+.container_24 .suffix_7 {
+  padding-right: 280px;
+}
+
+.container_24 .suffix_8 {
+  padding-right: 320px;
+}
+
+.container_24 .suffix_9 {
+  padding-right: 360px;
+}
+
+.container_24 .suffix_10 {
+  padding-right: 400px;
+}
+
+.container_24 .suffix_11 {
+  padding-right: 440px;
+}
+
+.container_24 .suffix_12 {
+  padding-right: 480px;
+}
+
+.container_24 .suffix_13 {
+  padding-right: 520px;
+}
+
+.container_24 .suffix_14 {
+  padding-right: 560px;
+}
+
+.container_24 .suffix_15 {
+  padding-right: 600px;
+}
+
+.container_24 .suffix_16 {
+  padding-right: 640px;
+}
+
+.container_24 .suffix_17 {
+  padding-right: 680px;
+}
+
+.container_24 .suffix_18 {
+  padding-right: 720px;
+}
+
+.container_24 .suffix_19 {
+  padding-right: 760px;
+}
+
+.container_24 .suffix_20 {
+  padding-right: 800px;
+}
+
+.container_24 .suffix_21 {
+  padding-right: 840px;
+}
+
+.container_24 .suffix_22 {
+  padding-right: 880px;
+}
+
+.container_24 .suffix_23 {
+  padding-right: 920px;
+}
+
+/* `Push Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .push_1 {
+  left: 40px;
+}
+
+.container_24 .push_2 {
+  left: 80px;
+}
+
+.container_24 .push_3 {
+  left: 120px;
+}
+
+.container_24 .push_4 {
+  left: 160px;
+}
+
+.container_24 .push_5 {
+  left: 200px;
+}
+
+.container_24 .push_6 {
+  left: 240px;
+}
+
+.container_24 .push_7 {
+  left: 280px;
+}
+
+.container_24 .push_8 {
+  left: 320px;
+}
+
+.container_24 .push_9 {
+  left: 360px;
+}
+
+.container_24 .push_10 {
+  left: 400px;
+}
+
+.container_24 .push_11 {
+  left: 440px;
+}
+
+.container_24 .push_12 {
+  left: 480px;
+}
+
+.container_24 .push_13 {
+  left: 520px;
+}
+
+.container_24 .push_14 {
+  left: 560px;
+}
+
+.container_24 .push_15 {
+  left: 600px;
+}
+
+.container_24 .push_16 {
+  left: 640px;
+}
+
+.container_24 .push_17 {
+  left: 680px;
+}
+
+.container_24 .push_18 {
+  left: 720px;
+}
+
+.container_24 .push_19 {
+  left: 760px;
+}
+
+.container_24 .push_20 {
+  left: 800px;
+}
+
+.container_24 .push_21 {
+  left: 840px;
+}
+
+.container_24 .push_22 {
+  left: 880px;
+}
+
+.container_24 .push_23 {
+  left: 920px;
+}
+
+/* `Pull Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .pull_1 {
+  left: -40px;
+}
+
+.container_24 .pull_2 {
+  left: -80px;
+}
+
+.container_24 .pull_3 {
+  left: -120px;
+}
+
+.container_24 .pull_4 {
+  left: -160px;
+}
+
+.container_24 .pull_5 {
+  left: -200px;
+}
+
+.container_24 .pull_6 {
+  left: -240px;
+}
+
+.container_24 .pull_7 {
+  left: -280px;
+}
+
+.container_24 .pull_8 {
+  left: -320px;
+}
+
+.container_24 .pull_9 {
+  left: -360px;
+}
+
+.container_24 .pull_10 {
+  left: -400px;
+}
+
+.container_24 .pull_11 {
+  left: -440px;
+}
+
+.container_24 .pull_12 {
+  left: -480px;
+}
+
+.container_24 .pull_13 {
+  left: -520px;
+}
+
+.container_24 .pull_14 {
+  left: -560px;
+}
+
+.container_24 .pull_15 {
+  left: -600px;
+}
+
+.container_24 .pull_16 {
+  left: -640px;
+}
+
+.container_24 .pull_17 {
+  left: -680px;
+}
+
+.container_24 .pull_18 {
+  left: -720px;
+}
+
+.container_24 .pull_19 {
+  left: -760px;
+}
+
+.container_24 .pull_20 {
+  left: -800px;
+}
+
+.container_24 .pull_21 {
+  left: -840px;
+}
+
+.container_24 .pull_22 {
+  left: -880px;
+}
+
+.container_24 .pull_23 {
+  left: -920px;
+}
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
+
+.clearfix:before,
+.clearfix:after {
+  content: '\0020';
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+/*
+  The following zoom:1 rule is specifically for IE6 + IE7.
+  Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+.clearfix {
+  zoom: 1;
+}

css/960/reset.css

@@ -0,0 +1,171 @@
+/* `XHTML, HTML4, HTML5 Reset
+----------------------------------------------------------------------------------------------------*/
+
+a,
+abbr,
+acronym,
+address,
+applet,
+article,
+aside,
+audio,
+b,
+big,
+blockquote,
+body,
+canvas,
+caption,
+center,
+cite,
+code,
+dd,
+del,
+details,
+dfn,
+dialog,
+div,
+dl,
+dt,
+em,
+embed,
+fieldset,
+figcaption,
+figure,
+font,
+footer,
+form,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+header,
+hgroup,
+hr,
+html,
+i,
+iframe,
+img,
+ins,
+kbd,
+label,
+legend,
+li,
+mark,
+menu,
+meter,
+nav,
+object,
+ol,
+output,
+p,
+pre,
+progress,
+q,
+rp,
+rt,
+ruby,
+s,
+samp,
+section,
+small,
+span,
+strike,
+strong,
+sub,
+summary,
+sup,
+table,
+tbody,
+td,
+tfoot,
+th,
+thead,
+time,
+tr,
+tt,
+u,
+ul,
+var,
+video,
+xmp {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  font-size: 100%;
+}
+
+html,
+body {
+  height: 100%;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+/*
+  Override the default (display: inline) for
+  browsers that do not recognize HTML5 tags.
+
+  IE8 (and lower) requires a shiv:
+  http://ejohn.org/blog/html5-shiv
+*/
+  display: block;
+}
+
+b,
+strong {
+/*
+  Makes browsers agree.
+  IE + Opera = font-weight: bold.
+  Gecko + WebKit = font-weight: bolder.
+*/
+  font-weight: bold;
+}
+
+img {
+  color: transparent;
+  font-size: 0;
+  vertical-align: middle;
+/*
+  For IE.
+  http://css-tricks.com/ie-fix-bicubic-scaling-for-images
+*/
+  -ms-interpolation-mode: bicubic;
+}
+
+li {
+/*
+  For IE6 + IE7.
+*/
+  display: list-item;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+th,
+td,
+caption {
+  font-weight: normal;
+  vertical-align: top;
+  text-align: left;
+}
+
+svg {
+/*
+  For IE9.
+*/
+  overflow: hidden;
+}

css/960/rtl_960.css

@@ -0,0 +1,631 @@
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/* `Containers
+----------------------------------------------------------------------------------------------------*/
+
+.container_12,
+.container_16 {
+  margin-right: auto;
+  margin-left: auto;
+  width: 960px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16 {
+  display: inline;
+  float: right;
+  margin-right: 10px;
+  margin-left: 10px;
+}
+
+.push_1, .pull_1,
+.push_2, .pull_2,
+.push_3, .pull_3,
+.push_4, .pull_4,
+.push_5, .pull_5,
+.push_6, .pull_6,
+.push_7, .pull_7,
+.push_8, .pull_8,
+.push_9, .pull_9,
+.push_10, .pull_10,
+.push_11, .pull_11,
+.push_12, .pull_12,
+.push_13, .pull_13,
+.push_14, .pull_14,
+.push_15, .pull_15 {
+  position: relative;
+}
+
+.container_12 .grid_3,
+.container_16 .grid_4 {
+  width: 220px;
+}
+
+.container_12 .grid_6,
+.container_16 .grid_8 {
+  width: 460px;
+}
+
+.container_12 .grid_9,
+.container_16 .grid_12 {
+  width: 700px;
+}
+
+.container_12 .grid_12,
+.container_16 .grid_16 {
+  width: 940px;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-right: 0;
+}
+
+.omega {
+  margin-left: 0;
+}
+
+/* `Grid >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .grid_1 {
+  width: 60px;
+}
+
+.container_12 .grid_2 {
+  width: 140px;
+}
+
+.container_12 .grid_4 {
+  width: 300px;
+}
+
+.container_12 .grid_5 {
+  width: 380px;
+}
+
+.container_12 .grid_7 {
+  width: 540px;
+}
+
+.container_12 .grid_8 {
+  width: 620px;
+}
+
+.container_12 .grid_10 {
+  width: 780px;
+}
+
+.container_12 .grid_11 {
+  width: 860px;
+}
+
+/* `Grid >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .grid_1 {
+  width: 40px;
+}
+
+.container_16 .grid_2 {
+  width: 100px;
+}
+
+.container_16 .grid_3 {
+  width: 160px;
+}
+
+.container_16 .grid_5 {
+  width: 280px;
+}
+
+.container_16 .grid_6 {
+  width: 340px;
+}
+
+.container_16 .grid_7 {
+  width: 400px;
+}
+
+.container_16 .grid_9 {
+  width: 520px;
+}
+
+.container_16 .grid_10 {
+  width: 580px;
+}
+
+.container_16 .grid_11 {
+  width: 640px;
+}
+
+.container_16 .grid_13 {
+  width: 760px;
+}
+
+.container_16 .grid_14 {
+  width: 820px;
+}
+
+.container_16 .grid_15 {
+  width: 880px;
+}
+
+/* `Prefix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_3,
+.container_16 .prefix_4 {
+  padding-right: 240px;
+}
+
+.container_12 .prefix_6,
+.container_16 .prefix_8 {
+  padding-right: 480px;
+}
+
+.container_12 .prefix_9,
+.container_16 .prefix_12 {
+  padding-right: 720px;
+}
+
+/* `Prefix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_1 {
+  padding-right: 80px;
+}
+
+.container_12 .prefix_2 {
+  padding-right: 160px;
+}
+
+.container_12 .prefix_4 {
+  padding-right: 320px;
+}
+
+.container_12 .prefix_5 {
+  padding-right: 400px;
+}
+
+.container_12 .prefix_7 {
+  padding-right: 560px;
+}
+
+.container_12 .prefix_8 {
+  padding-right: 640px;
+}
+
+.container_12 .prefix_10 {
+  padding-right: 800px;
+}
+
+.container_12 .prefix_11 {
+  padding-right: 880px;
+}
+
+/* `Prefix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .prefix_1 {
+  padding-right: 60px;
+}
+
+.container_16 .prefix_2 {
+  padding-right: 120px;
+}
+
+.container_16 .prefix_3 {
+  padding-right: 180px;
+}
+
+.container_16 .prefix_5 {
+  padding-right: 300px;
+}
+
+.container_16 .prefix_6 {
+  padding-right: 360px;
+}
+
+.container_16 .prefix_7 {
+  padding-right: 420px;
+}
+
+.container_16 .prefix_9 {
+  padding-right: 540px;
+}
+
+.container_16 .prefix_10 {
+  padding-right: 600px;
+}
+
+.container_16 .prefix_11 {
+  padding-right: 660px;
+}
+
+.container_16 .prefix_13 {
+  padding-right: 780px;
+}
+
+.container_16 .prefix_14 {
+  padding-right: 840px;
+}
+
+.container_16 .prefix_15 {
+  padding-right: 900px;
+}
+
+/* `Suffix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_3,
+.container_16 .suffix_4 {
+  padding-left: 240px;
+}
+
+.container_12 .suffix_6,
+.container_16 .suffix_8 {
+  padding-left: 480px;
+}
+
+.container_12 .suffix_9,
+.container_16 .suffix_12 {
+  padding-left: 720px;
+}
+
+/* `Suffix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_1 {
+  padding-left: 80px;
+}
+
+.container_12 .suffix_2 {
+  padding-left: 160px;
+}
+
+.container_12 .suffix_4 {
+  padding-left: 320px;
+}
+
+.container_12 .suffix_5 {
+  padding-left: 400px;
+}
+
+.container_12 .suffix_7 {
+  padding-left: 560px;
+}
+
+.container_12 .suffix_8 {
+  padding-left: 640px;
+}
+
+.container_12 .suffix_10 {
+  padding-left: 800px;
+}
+
+.container_12 .suffix_11 {
+  padding-left: 880px;
+}
+
+/* `Suffix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .suffix_1 {
+  padding-left: 60px;
+}
+
+.container_16 .suffix_2 {
+  padding-left: 120px;
+}
+
+.container_16 .suffix_3 {
+  padding-left: 180px;
+}
+
+.container_16 .suffix_5 {
+  padding-left: 300px;
+}
+
+.container_16 .suffix_6 {
+  padding-left: 360px;
+}
+
+.container_16 .suffix_7 {
+  padding-left: 420px;
+}
+
+.container_16 .suffix_9 {
+  padding-left: 540px;
+}
+
+.container_16 .suffix_10 {
+  padding-left: 600px;
+}
+
+.container_16 .suffix_11 {
+  padding-left: 660px;
+}
+
+.container_16 .suffix_13 {
+  padding-left: 780px;
+}
+
+.container_16 .suffix_14 {
+  padding-left: 840px;
+}
+
+.container_16 .suffix_15 {
+  padding-left: 900px;
+}
+
+/* `Push Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_3,
+.container_16 .push_4 {
+  right: 240px;
+}
+
+.container_12 .push_6,
+.container_16 .push_8 {
+  right: 480px;
+}
+
+.container_12 .push_9,
+.container_16 .push_12 {
+  right: 720px;
+}
+
+/* `Push Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_1 {
+  right: 80px;
+}
+
+.container_12 .push_2 {
+  right: 160px;
+}
+
+.container_12 .push_4 {
+  right: 320px;
+}
+
+.container_12 .push_5 {
+  right: 400px;
+}
+
+.container_12 .push_7 {
+  right: 560px;
+}
+
+.container_12 .push_8 {
+  right: 640px;
+}
+
+.container_12 .push_10 {
+  right: 800px;
+}
+
+.container_12 .push_11 {
+  right: 880px;
+}
+
+/* `Push Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .push_1 {
+  right: 60px;
+}
+
+.container_16 .push_2 {
+  right: 120px;
+}
+
+.container_16 .push_3 {
+  right: 180px;
+}
+
+.container_16 .push_5 {
+  right: 300px;
+}
+
+.container_16 .push_6 {
+  right: 360px;
+}
+
+.container_16 .push_7 {
+  right: 420px;
+}
+
+.container_16 .push_9 {
+  right: 540px;
+}
+
+.container_16 .push_10 {
+  right: 600px;
+}
+
+.container_16 .push_11 {
+  right: 660px;
+}
+
+.container_16 .push_13 {
+  right: 780px;
+}
+
+.container_16 .push_14 {
+  right: 840px;
+}
+
+.container_16 .push_15 {
+  right: 900px;
+}
+
+/* `Pull Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_3,
+.container_16 .pull_4 {
+  right: -240px;
+}
+
+.container_12 .pull_6,
+.container_16 .pull_8 {
+  right: -480px;
+}
+
+.container_12 .pull_9,
+.container_16 .pull_12 {
+  right: -720px;
+}
+
+/* `Pull Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_1 {
+  right: -80px;
+}
+
+.container_12 .pull_2 {
+  right: -160px;
+}
+
+.container_12 .pull_4 {
+  right: -320px;
+}
+
+.container_12 .pull_5 {
+  right: -400px;
+}
+
+.container_12 .pull_7 {
+  right: -560px;
+}
+
+.container_12 .pull_8 {
+  right: -640px;
+}
+
+.container_12 .pull_10 {
+  right: -800px;
+}
+
+.container_12 .pull_11 {
+  right: -880px;
+}
+
+/* `Pull Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .pull_1 {
+  right: -60px;
+}
+
+.container_16 .pull_2 {
+  right: -120px;
+}
+
+.container_16 .pull_3 {
+  right: -180px;
+}
+
+.container_16 .pull_5 {
+  right: -300px;
+}
+
+.container_16 .pull_6 {
+  right: -360px;
+}
+
+.container_16 .pull_7 {
+  right: -420px;
+}
+
+.container_16 .pull_9 {
+  right: -540px;
+}
+
+.container_16 .pull_10 {
+  right: -600px;
+}
+
+.container_16 .pull_11 {
+  right: -660px;
+}
+
+.container_16 .pull_13 {
+  right: -780px;
+}
+
+.container_16 .pull_14 {
+  right: -840px;
+}
+
+.container_16 .pull_15 {
+  right: -900px;
+}
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
+
+.clearfix:before,
+.clearfix:after {
+  content: '\0020';
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+/*
+  The following zoom:1 rule is specifically for IE6 + IE7.
+  Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+.clearfix {
+  zoom: 1;
+}

css/960/rtl_960_24_col.css

@@ -0,0 +1,602 @@
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/* `Container >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+.container_24 {
+  margin-right: auto;
+  margin-left: auto;
+  width: 960px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16,
+.grid_17,
+.grid_18,
+.grid_19,
+.grid_20,
+.grid_21,
+.grid_22,
+.grid_23,
+.grid_24 {
+  display: inline;
+  float: right;
+  margin-right: 5px;
+  margin-left: 5px;
+}
+
+.push_1, .pull_1,
+.push_2, .pull_2,
+.push_3, .pull_3,
+.push_4, .pull_4,
+.push_5, .pull_5,
+.push_6, .pull_6,
+.push_7, .pull_7,
+.push_8, .pull_8,
+.push_9, .pull_9,
+.push_10, .pull_10,
+.push_11, .pull_11,
+.push_12, .pull_12,
+.push_13, .pull_13,
+.push_14, .pull_14,
+.push_15, .pull_15,
+.push_16, .pull_16,
+.push_17, .pull_17,
+.push_18, .pull_18,
+.push_19, .pull_19,
+.push_20, .pull_20,
+.push_21, .pull_21,
+.push_22, .pull_22,
+.push_23, .pull_23 {
+  position: relative;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-right: 0;
+}
+
+.omega {
+  margin-left: 0;
+}
+
+/* `Grid >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .grid_1 {
+  width: 30px;
+}
+
+.container_24 .grid_2 {
+  width: 70px;
+}
+
+.container_24 .grid_3 {
+  width: 110px;
+}
+
+.container_24 .grid_4 {
+  width: 150px;
+}
+
+.container_24 .grid_5 {
+  width: 190px;
+}
+
+.container_24 .grid_6 {
+  width: 230px;
+}
+
+.container_24 .grid_7 {
+  width: 270px;
+}
+
+.container_24 .grid_8 {
+  width: 310px;
+}
+
+.container_24 .grid_9 {
+  width: 350px;
+}
+
+.container_24 .grid_10 {
+  width: 390px;
+}
+
+.container_24 .grid_11 {
+  width: 430px;
+}
+
+.container_24 .grid_12 {
+  width: 470px;
+}
+
+.container_24 .grid_13 {
+  width: 510px;
+}
+
+.container_24 .grid_14 {
+  width: 550px;
+}
+
+.container_24 .grid_15 {
+  width: 590px;
+}
+
+.container_24 .grid_16 {
+  width: 630px;
+}
+
+.container_24 .grid_17 {
+  width: 670px;
+}
+
+.container_24 .grid_18 {
+  width: 710px;
+}
+
+.container_24 .grid_19 {
+  width: 750px;
+}
+
+.container_24 .grid_20 {
+  width: 790px;
+}
+
+.container_24 .grid_21 {
+  width: 830px;
+}
+
+.container_24 .grid_22 {
+  width: 870px;
+}
+
+.container_24 .grid_23 {
+  width: 910px;
+}
+
+.container_24 .grid_24 {
+  width: 950px;
+}
+
+/* `Prefix Extra Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .prefix_1 {
+  padding-right: 40px;
+}
+
+.container_24 .prefix_2 {
+  padding-right: 80px;
+}
+
+.container_24 .prefix_3 {
+  padding-right: 120px;
+}
+
+.container_24 .prefix_4 {
+  padding-right: 160px;
+}
+
+.container_24 .prefix_5 {
+  padding-right: 200px;
+}
+
+.container_24 .prefix_6 {
+  padding-right: 240px;
+}
+
+.container_24 .prefix_7 {
+  padding-right: 280px;
+}
+
+.container_24 .prefix_8 {
+  padding-right: 320px;
+}
+
+.container_24 .prefix_9 {
+  padding-right: 360px;
+}
+
+.container_24 .prefix_10 {
+  padding-right: 400px;
+}
+
+.container_24 .prefix_11 {
+  padding-right: 440px;
+}
+
+.container_24 .prefix_12 {
+  padding-right: 480px;
+}
+
+.container_24 .prefix_13 {
+  padding-right: 520px;
+}
+
+.container_24 .prefix_14 {
+  padding-right: 560px;
+}
+
+.container_24 .prefix_15 {
+  padding-right: 600px;
+}
+
+.container_24 .prefix_16 {
+  padding-right: 640px;
+}
+
+.container_24 .prefix_17 {
+  padding-right: 680px;
+}
+
+.container_24 .prefix_18 {
+  padding-right: 720px;
+}
+
+.container_24 .prefix_19 {
+  padding-right: 760px;
+}
+
+.container_24 .prefix_20 {
+  padding-right: 800px;
+}
+
+.container_24 .prefix_21 {
+  padding-right: 840px;
+}
+
+.container_24 .prefix_22 {
+  padding-right: 880px;
+}
+
+.container_24 .prefix_23 {
+  padding-right: 920px;
+}
+
+/* `Suffix Extra Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .suffix_1 {
+  padding-left: 40px;
+}
+
+.container_24 .suffix_2 {
+  padding-left: 80px;
+}
+
+.container_24 .suffix_3 {
+  padding-left: 120px;
+}
+
+.container_24 .suffix_4 {
+  padding-left: 160px;
+}
+
+.container_24 .suffix_5 {
+  padding-left: 200px;
+}
+
+.container_24 .suffix_6 {
+  padding-left: 240px;
+}
+
+.container_24 .suffix_7 {
+  padding-left: 280px;
+}
+
+.container_24 .suffix_8 {
+  padding-left: 320px;
+}
+
+.container_24 .suffix_9 {
+  padding-left: 360px;
+}
+
+.container_24 .suffix_10 {
+  padding-left: 400px;
+}
+
+.container_24 .suffix_11 {
+  padding-left: 440px;
+}
+
+.container_24 .suffix_12 {
+  padding-left: 480px;
+}
+
+.container_24 .suffix_13 {
+  padding-left: 520px;
+}
+
+.container_24 .suffix_14 {
+  padding-left: 560px;
+}
+
+.container_24 .suffix_15 {
+  padding-left: 600px;
+}
+
+.container_24 .suffix_16 {
+  padding-left: 640px;
+}
+
+.container_24 .suffix_17 {
+  padding-left: 680px;
+}
+
+.container_24 .suffix_18 {
+  padding-left: 720px;
+}
+
+.container_24 .suffix_19 {
+  padding-left: 760px;
+}
+
+.container_24 .suffix_20 {
+  padding-left: 800px;
+}
+
+.container_24 .suffix_21 {
+  padding-left: 840px;
+}
+
+.container_24 .suffix_22 {
+  padding-left: 880px;
+}
+
+.container_24 .suffix_23 {
+  padding-left: 920px;
+}
+
+/* `Push Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .push_1 {
+  right: 40px;
+}
+
+.container_24 .push_2 {
+  right: 80px;
+}
+
+.container_24 .push_3 {
+  right: 120px;
+}
+
+.container_24 .push_4 {
+  right: 160px;
+}
+
+.container_24 .push_5 {
+  right: 200px;
+}
+
+.container_24 .push_6 {
+  right: 240px;
+}
+
+.container_24 .push_7 {
+  right: 280px;
+}
+
+.container_24 .push_8 {
+  right: 320px;
+}
+
+.container_24 .push_9 {
+  right: 360px;
+}
+
+.container_24 .push_10 {
+  right: 400px;
+}
+
+.container_24 .push_11 {
+  right: 440px;
+}
+
+.container_24 .push_12 {
+  right: 480px;
+}
+
+.container_24 .push_13 {
+  right: 520px;
+}
+
+.container_24 .push_14 {
+  right: 560px;
+}
+
+.container_24 .push_15 {
+  right: 600px;
+}
+
+.container_24 .push_16 {
+  right: 640px;
+}
+
+.container_24 .push_17 {
+  right: 680px;
+}
+
+.container_24 .push_18 {
+  right: 720px;
+}
+
+.container_24 .push_19 {
+  right: 760px;
+}
+
+.container_24 .push_20 {
+  right: 800px;
+}
+
+.container_24 .push_21 {
+  right: 840px;
+}
+
+.container_24 .push_22 {
+  right: 880px;
+}
+
+.container_24 .push_23 {
+  right: 920px;
+}
+
+/* `Pull Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_24 .pull_1 {
+  right: -40px;
+}
+
+.container_24 .pull_2 {
+  right: -80px;
+}
+
+.container_24 .pull_3 {
+  right: -120px;
+}
+
+.container_24 .pull_4 {
+  right: -160px;
+}
+
+.container_24 .pull_5 {
+  right: -200px;
+}
+
+.container_24 .pull_6 {
+  right: -240px;
+}
+
+.container_24 .pull_7 {
+  right: -280px;
+}
+
+.container_24 .pull_8 {
+  right: -320px;
+}
+
+.container_24 .pull_9 {
+  right: -360px;
+}
+
+.container_24 .pull_10 {
+  right: -400px;
+}
+
+.container_24 .pull_11 {
+  right: -440px;
+}
+
+.container_24 .pull_12 {
+  right: -480px;
+}
+
+.container_24 .pull_13 {
+  right: -520px;
+}
+
+.container_24 .pull_14 {
+  right: -560px;
+}
+
+.container_24 .pull_15 {
+  right: -600px;
+}
+
+.container_24 .pull_16 {
+  right: -640px;
+}
+
+.container_24 .pull_17 {
+  right: -680px;
+}
+
+.container_24 .pull_18 {
+  right: -720px;
+}
+
+.container_24 .pull_19 {
+  right: -760px;
+}
+
+.container_24 .pull_20 {
+  right: -800px;
+}
+
+.container_24 .pull_21 {
+  right: -840px;
+}
+
+.container_24 .pull_22 {
+  right: -880px;
+}
+
+.container_24 .pull_23 {
+  right: -920px;
+}
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
+
+.clearfix:before,
+.clearfix:after {
+  content: '\0020';
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+/*
+  The following zoom:1 rule is specifically for IE6 + IE7.
+  Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+.clearfix {
+  zoom: 1;
+}

css/960/rtl_text.css

@@ -0,0 +1,84 @@
+/*
+  960 Grid System ~ Text CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/* `Basic HTML
+----------------------------------------------------------------------------------------------------*/
+
+body {
+  font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
+}
+
+a:focus {
+  outline: 1px dotted;
+}
+
+hr {
+  border: 0 #ccc solid;
+  border-top-width: 1px;
+  clear: both;
+  height: 0;
+}
+
+/* `Headings
+----------------------------------------------------------------------------------------------------*/
+
+h1 {
+  font-size: 25px;
+}
+
+h2 {
+  font-size: 23px;
+}
+
+h3 {
+  font-size: 21px;
+}
+
+h4 {
+  font-size: 19px;
+}
+
+h5 {
+  font-size: 17px;
+}
+
+h6 {
+  font-size: 15px;
+}
+
+/* `Spacing
+----------------------------------------------------------------------------------------------------*/
+
+ol {
+  list-style: decimal;
+}
+
+ul {
+  list-style: disc;
+}
+
+li {
+  margin-right: 30px;
+}
+
+p,
+dl,
+hr,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ol,
+ul,
+pre,
+table,
+address,
+fieldset {
+  margin-bottom: 20px;
+}

css/960/text.css

@@ -0,0 +1,81 @@
+/*
+  960 Grid System ~ Text CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/* `Basic HTML
+----------------------------------------------------------------------------------------------------*/
+
+body {
+  font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
+}
+
+hr {
+  border: 0 #ccc solid;
+  border-top-width: 1px;
+  clear: both;
+  height: 0;
+}
+
+/* `Headings
+----------------------------------------------------------------------------------------------------*/
+
+h1 {
+  font-size: 25px;
+}
+
+h2 {
+  font-size: 23px;
+}
+
+h3 {
+  font-size: 21px;
+}
+
+h4 {
+  font-size: 19px;
+}
+
+h5 {
+  font-size: 17px;
+}
+
+h6 {
+  font-size: 15px;
+}
+
+/* `Spacing
+----------------------------------------------------------------------------------------------------*/
+
+ol {
+  list-style: decimal;
+}
+
+ul {
+  list-style: disc;
+}
+
+li {
+  margin-left: 30px;
+}
+
+p,
+dl,
+hr,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ol,
+ul,
+pre,
+table,
+address,
+fieldset,
+figure {
+  margin-bottom: 20px;
+}

css/960gs/reset.css

@@ -1 +0,0 @@
-a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,dialog,div,dl,dt,em,embed,fieldset,figcaption,figure,font,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,meter,nav,object,ol,output,p,pre,progress,q,rp,rt,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video,xmp{border:0;font-size:100%;margin:0;padding:0}html,body{height:100%}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}b,strong{font-weight:bold}img{color:transparent;font-size:0;vertical-align:middle;-ms-interpolation-mode:bicubic}li{display:list-item}table{border-collapse:collapse;border-spacing:0}th,td,caption{font-weight:normal;vertical-align:top;text-align:left}svg{overflow:hidden}

css/960gs/rtl_text.css

@@ -1 +0,0 @@
-body{font:13px/1.5 'Helvetica Neue',Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:21px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:disc}li{margin-right:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset{margin-bottom:20px}

css/960gs/text.css

@@ -1 +0,0 @@
-body{font:13px/1.5 'Helvetica Neue',Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:21px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:disc}li{margin-left:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset,figure{margin-bottom:20px}

css/style.css

@@ -90,7 +90,7 @@ textarea { overflow: auto; }
 	-webkit-border-radius: 6px; 
 	border-radius: 6px;
 }
-#nav-main ul li { float: left; } 
+#nav-main ul li { float: left; margin: 0; } 
 #nav-main ul li:hover { position: relative; }
 #nav-main ul li a { 
 	text-decoration: none; 

footer.php

@@ -1,4 +1,4 @@
-		<footer id="content-info" class="<?php echo CONTAINER_CLASS; ?>" role="contentinfo">
+		<footer id="content-info" class="<?php echo roots_container_class; ?>" role="contentinfo">
 			<div class="container">
 				<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar("Footer") ) : ?>
 				<?php endif; ?>
@@ -25,7 +25,6 @@
 				<?php } ?>
 				
 			</div>
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</footer>
 	</div><!-- /#wrap -->
 <?php wp_footer(); ?>

front-page.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
@@ -10,6 +10,5 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

functions.php

@@ -11,58 +11,57 @@ include_once('includes/roots-cleanup.php');		// code cleanup/removal
 include_once('includes/roots-htaccess.php');	// h5bp htaccess
 
 // set the value of the main container class depending on the selected grid framework
-$roots_selected_css_framework = get_option('roots_css_framework');
+$roots_css_framework = get_option('roots_css_framework');
-if (!defined('CONTAINER_CLASS')){
+if (!defined('roots_container_class')) {
-	if ($roots_selected_css_framework === 'blueprint'){
+	switch ($roots_css_framework) {
-		define('CONTAINER_CLASS', 'span-24');
+		case 'blueprint':
-		define('IS_960_GS',False);
+			define('roots_container_class', 'span-24');
-	}
+			define('is_960gs', false);
-	elseif ($roots_selected_css_framework === '960gs_12'){
+		case '960gs_12':
-		define('CONTAINER_CLASS', 'container_12');
+			define('roots_container_class', 'container_12');
-		define('IS_960_GS',True);
+			define('IS_960GS', true);
-	}	
+			define('is_960gs_12', true);
-	elseif ($roots_selected_css_framework === '960gs_16'){
+		case '960gs_16':
-		define('CONTAINER_CLASS', 'container_16');	
+			define('roots_container_class', 'container_16');
-		define('IS_960_GS',True);
+			define('is_960gs', true);
-	}
+			define('is_960gs_16', true);
-	elseif ($roots_selected_css_framework === '960gs_24'){
+		case '960gs_24':
-		define('CONTAINER_CLASS', 'container_24');
+			define('roots_container_class', 'container_24');
-		define('IS_960_GS',True);
+			define('is_960gs', true);
-	}
+			define('is_960gs_24', true);
-	else {
+		default:
-		define('CONTAINER_CLASS', '');
+			define('roots_container_class', '');
-		define('IS_960_GS',False);
+			define('is_960gs', false);
-	}
-
-}
-
-function get_roots_css_framework_stylesheets(){
-	$roots_selected_css_framework = get_option('roots_css_framework');
-	if ($roots_selected_css_framework === 'blueprint'){
-		return '<link rel="stylesheet" href="/css/blueprint/screen.css">';
-	}
-	elseif ($roots_selected_css_framework === '960gs_12' || $roots_selected_css_framework === '960gs_16'){
-		return <<<EOD
-		<link rel="stylesheet" href="/css/960gs/reset.css">
-		<link rel="stylesheet" href="/css/960gs/text.css">
-		<link rel="stylesheet" href="/css/960gs/960.css">		
-EOD;
-	}
-	elseif ($roots_selected_css_framework === '960gs_24'){
-		return <<<EOD
-		<link rel="stylesheet" href=""$roots_style_sheet_uri"/css/960gs/reset.css">
-		<link rel="stylesheet" href=""$roots_style_sheet_uri"/css/960gs/text.css">
-		<link rel="stylesheet" href=""$roots_style_sheet_uri"/css/960gs/960_24_col.css">		
-EOD;
-	}
-	else {
-		return '';
 	}
 }
 
-function get_roots_960gs_cleardiv() {
+function get_roots_css_framework_stylesheets() {
-	if (IS_960_GS) return "<div class=\"clear\" ></div>";
+	$css_uri = get_stylesheet_directory_uri();
-	else return "";
+	$styles = '';
+
+	if (!is_960gs) {
+		$styles .= "<link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/screen.css\">\n";
+	} elseif (is_960gs_12 == 1 || is_960gs_16 == 1) {
+		$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) {
+		$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";
+	}
+
+	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";
+
+	if (!is_960gs) {
+		$styles .= "\t<!--[if lt IE 8]>i<link rel=\"stylesheet\" href=\"$css_uri/css/blueprint/ie.css\"><![endif]-->\n";
+	}
+
+  return $styles;
 }
 	
 // set the maximum 'Large' image width to the Blueprint grid maximum width

header.php

@@ -12,16 +12,6 @@
 
 	<?php echo get_roots_css_framework_stylesheets(); ?>
 	
-	<?php if (class_exists('RGForms')) { ?>
-		<link rel="stylesheet" href="<?php echo plugins_url(); ?>/gravityforms/css/forms.css">
-	<?php } ?>
-	
-	<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri(); ?>/css/style.css">
-	
-	<?php if(!IS_960_GS) { ?>
-		<!--[if lt IE 8]><link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri(); ?>/css/blueprint/ie.css"><![endif]-->
-	<?php } ?>
-	
 	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php site_url(); ?>/feed/">
 
 	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/libs/modernizr-1.7.min.js"></script>
@@ -31,28 +21,25 @@
 	<?php wp_head(); ?>
 
 	<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/scripts.js"></script>
-	<?php if (get_option('roots_google_analytics') !== "") { ?>
+<?php if (get_option('roots_google_analytics') !== "") { ?>
-		<script>
+	<script>
-			var _gaq=[["_setAccount","<?php echo get_option('roots_google_analytics') ?>"],["_trackPageview"]];
+		var _gaq=[["_setAccount","<?php echo get_option('roots_google_analytics') ?>"],["_trackPageview"]];
-			(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+		(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
-			g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
+		g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
-			s.parentNode.insertBefore(g,s)}(document,"script"));
+		s.parentNode.insertBefore(g,s)}(document,"script"));
-		</script>
+	</script>
-	<?php } ?>
+<?php } ?>
 </head>
 <body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
 	<div id="wrap" class="container" role="document">
-		<header id="banner" class="<?php echo CONTAINER_CLASS; ?>" role="banner">
+		<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>
-				<nav id="nav-main" class="<?php echo CONTAINER_CLASS; ?>" role="navigation">
+				<nav id="nav-main" class="<?php echo roots_container_class; ?>" role="navigation">
 					<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
 				</nav>
 				<nav id="nav-utility">
 					<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
 				</nav>				
 			</div>
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</header>
-
-		

includes/css/options.css

@@ -19,6 +19,7 @@ body.toplevel_page_roots .ui-widget-content .ui-state-active,
 body.toplevel_page_roots .ui-widget-header .ui-state-active { background: #fff !important; }
 
 ul.options li { clear: both; margin-bottom: 8px; }
+ul.options li .container { float: left; }
 ul.options label.settings-label { font-size: 1em; font-weight: 700; float: left; width: 250px; margin: 3px 0 0 0; }
 ul.options input.text { float: left; width: 300px; }
 ul.options span.note { clear: both; float: left; margin: 2px 0 8px 250px; display: block; font-size: 0.8em; line-height: 1.5em; }

includes/roots-cleanup.php

@@ -126,7 +126,7 @@ function roots_head_cleanup() {
 		if (!$id = $wp_the_query->get_queried_object_id())
 			return;
 		$link = get_permalink($id);
-		echo "	<link rel=\"canonical\" href=\"$link\">\n";
+		echo "<link rel=\"canonical\" href=\"$link\">\n";
 	}
 	add_action('wp_head', 'roots_rel_canonical');	
 	

includes/roots-options.php

@@ -78,22 +78,24 @@ function roots_settings_page() { ?>
 			</ul>
 			<div id="general">
 				<ul class="options clearfix">	
-					<li>
+					<li class="clearfix">
-						<label class="settings-label">Css Grid Framework</label>
+						<label class="settings-label">CSS Grid Framework</label>
-						<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</label>
+						<div class="container">
-						<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>
+							<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_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>
+							<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_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_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>
+						</div>
 					</li>
 					<li>	
 						<label class="settings-label">Class for #main</label>
 						<input name="roots_main_class" type="text" value="<?php echo get_option('roots_main_class'); ?>" class="text" />
-						<span class="note">Enter your Blueprint CSS grid classes (use <a href="http://ianli.com/labs/blueprinter/">Blueprinter</a> to create a non-default grid)</span>
+						<span class="note">Enter your grid classes</span>
 					</li>
 					<li>
 						<label class="settings-label">Class for #sidebar</label>
 						<input name="roots_sidebar_class" type="text" value="<?php echo get_option('roots_sidebar_class'); ?>" class="text" />
-						<span class="note">Enter your Blueprint CSS grid classes (use <a href="http://ianli.com/labs/blueprinter/">Blueprinter</a> to create a non-default grid)</span>
+						<span class="note">Enter your grid classes</span>
 					</li>									
 					<li>
 						<label class="settings-label">Google Analytics Tracking ID</label>

index.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
+		<div id="content" class="<?php echo roots_container_class; ?>">
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<h1>Latest Posts</h1>
@@ -11,6 +11,5 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->		
 <?php get_footer(); ?>

page-custom.php

@@ -3,7 +3,7 @@
 Template Name: Custom
 */
 get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
@@ -14,6 +14,5 @@ get_header(); ?>
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

page-full.php

@@ -3,8 +3,8 @@
 Template Name: Full Width
 */
 get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
-			<div id="main" class="<?php echo CONTAINER_CLASS; ?>" role="main">
+			<div id="main" class="<?php echo roots_container_class; ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
 				</div>

page-sitemap.php

@@ -3,7 +3,7 @@
 Template Name: Sitemap
 */
 get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
@@ -20,6 +20,5 @@ get_header(); ?>
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

page-subpages.php

@@ -3,7 +3,7 @@
 Template Name: List Subpages
 */
 get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
@@ -21,6 +21,5 @@ get_header(); ?>
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

page.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'page'); ?>
@@ -10,6 +10,5 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

search.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<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>				
@@ -11,6 +11,5 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
-			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>

single.php

@@ -1,5 +1,5 @@
 <?php get_header(); ?>
-		<div id="content" class="<?php echo CONTAINER_CLASS; ?>">	
+		<div id="content" class="<?php echo roots_container_class; ?>">	
 			<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
 				<div class="container">
 					<?php get_template_part('loop', 'single'); ?>		
@@ -10,6 +10,5 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->			
-			<?php echo get_roots_960gs_cleardiv() ?>	
 		</div><!-- /#content -->
 <?php get_footer(); ?>

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.0.0
+Version:            3.1.0
 Author:             Ben Word
 Author URI:         http://benword.com/
 Tags:               roots, boilerplate, blueprint, starkers
@@ -10,9 +10,11 @@ Tags:               roots, boilerplate, blueprint, starkers
 License:            The Unlicense
 License URI:        http://unlicense.org/
 
-Updated:            March 28 2011
+Updated:            April 1 2011
 
 Changelog:
+3.1.0 [04-01-2011]  Added support for 960.gs thanks to John Liuti, added more onto the .htaccess from HTML5 Boilerplate, made the theme directory
+                    and name renamable
 3.0.0 [03-28-2011]  Changed name from BB to Roots, updated various areas to match the latest changes to HTML5 Boilerplate, changed the theme
                     markup based on hCard/Readability Guidelines and work by Jonathan Neal, theme activation now creates the navigation menus and
                     automatically sets their locations, permalink structure is now set to /%year%/%postname%/ for performance reasons, uploads