From 816b1ab28cf5a63b7c9bf89bf36a0aa8dadfe293 Mon Sep 17 00:00:00 2001
From: Joanthan Liuti <liuti.john@gmail.com>
Date: Fri, 1 Apr 2011 11:32:40 +0200
Subject: [PATCH] [ADD] Added the max content width for 960gs + clear div

---
 archive.php       |  1 +
 footer.php        |  1 +
 front-page.php    |  1 +
 functions.php     | 28 +++++++++++++++++++++-------
 header.php        | 34 +++++++++++++++++++++-------------
 index.php         |  1 +
 page-custom.php   |  1 +
 page-sitemap.php  |  1 +
 page-subpages.php |  1 +
 page.php          |  1 +
 search.php        |  1 +
 single.php        |  3 ++-
 12 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/archive.php b/archive.php
index e3fd6bc..e5ee6d0 100644
--- a/archive.php
+++ b/archive.php
@@ -11,5 +11,6 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/footer.php b/footer.php
index 4f091f8..6fc536c 100644
--- a/footer.php
+++ b/footer.php
@@ -25,6 +25,7 @@
 				<?php } ?>
 				
 			</div>
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</footer>
 	</div><!-- /#wrap -->
 <?php wp_footer(); ?>
diff --git a/front-page.php b/front-page.php
index f201996..5378340 100644
--- a/front-page.php
+++ b/front-page.php
@@ -10,5 +10,6 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/functions.php b/functions.php
index 0013ab4..8566776 100644
--- a/functions.php
+++ b/functions.php
@@ -10,15 +10,26 @@ 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');
 if (!defined('CONTAINER_CLASS')){
-	if ($roots_selected_css_framework === 'blueprint')
+	if ($roots_selected_css_framework === 'blueprint'){
 		define('CONTAINER_CLASS', 'span-24');
-	elseif ($roots_selected_css_framework === '960gs_12')
+		define('IS_960_GS',False);
+	}
+	elseif ($roots_selected_css_framework === '960gs_12'){
 		define('CONTAINER_CLASS', 'container_12');
-	elseif ($roots_selected_css_framework === '960gs_16')
+		define('IS_960_GS',True);
+	}	
+	elseif ($roots_selected_css_framework === '960gs_16'){
 		define('CONTAINER_CLASS', 'container_16');	
-	elseif ($roots_selected_css_framework === '960gs_24')
+		define('IS_960_GS',True);
+	}
+	elseif ($roots_selected_css_framework === '960gs_24'){
 		define('CONTAINER_CLASS', 'container_24');
-	else define('CONTAINER_CLASS', '');
+		define('IS_960_GS',True);
+	}
+	else {
+		define('CONTAINER_CLASS', '');
+		define('IS_960_GS',False);
+	}
 
 }
 
@@ -46,10 +57,13 @@ EOD;
 	}
 }
 
-
+function get_roots_960gs_cleardiv() {
+	if (IS_960_GS) return "<div class=\"clear\" ></div>";
+	else return "";
+}
 	
 // set the maximum 'Large' image width to the Blueprint grid maximum width
-if (!isset($content_width)) $content_width = 950;
+if (!isset($content_width)) $roots_selected_css_framework === 'blueprint' ? $content_width = 950 : $content_width = 940;
 
 // 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:
diff --git a/header.php b/header.php
index 88ad981..87d7c4e 100644
--- a/header.php
+++ b/header.php
@@ -11,12 +11,17 @@
 	<meta name="viewport" content="width=device-width; initial-scale=1.0">
 
 	<?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 } ?>
+	
+	<?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">
-	<!--[if lt IE 8]><link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri(); ?>/css/blueprint/ie.css"><![endif]-->
-
+	
+	<?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>
@@ -26,14 +31,14 @@
 	<?php wp_head(); ?>
 
 	<script src="<?php echo get_stylesheet_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"]];
-		(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";
-		s.parentNode.insertBefore(g,s)}(document,"script"));
-	</script>
-<?php } ?>
+	<?php if (get_option('roots_google_analytics') !== "") { ?>
+		<script>
+			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;
+			g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
+			s.parentNode.insertBefore(g,s)}(document,"script"));
+		</script>
+	<?php } ?>
 </head>
 <body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
 	<div id="wrap" class="container" role="document">
@@ -47,4 +52,7 @@
 					<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
 				</nav>				
 			</div>
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</header>
+
+		
diff --git a/index.php b/index.php
index 1bad266..b291c3e 100644
--- a/index.php
+++ b/index.php
@@ -11,5 +11,6 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->		
 <?php get_footer(); ?>
diff --git a/page-custom.php b/page-custom.php
index 4b3221e..597686e 100644
--- a/page-custom.php
+++ b/page-custom.php
@@ -14,5 +14,6 @@ get_header(); ?>
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/page-sitemap.php b/page-sitemap.php
index b2d5caa..1202e09 100644
--- a/page-sitemap.php
+++ b/page-sitemap.php
@@ -20,5 +20,6 @@ get_header(); ?>
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/page-subpages.php b/page-subpages.php
index 80f3b74..7744cf7 100644
--- a/page-subpages.php
+++ b/page-subpages.php
@@ -21,5 +21,6 @@ get_header(); ?>
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/page.php b/page.php
index f201996..5378340 100644
--- a/page.php
+++ b/page.php
@@ -10,5 +10,6 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/search.php b/search.php
index 1d5aaa3..54fecd8 100644
--- a/search.php
+++ b/search.php
@@ -11,5 +11,6 @@
 					<?php get_sidebar(); ?>
 				</div>
 			</aside><!-- /#sidebar -->
+			<?php echo get_roots_960gs_cleardiv() ?>
 		</div><!-- /#content -->
 <?php get_footer(); ?>
diff --git a/single.php b/single.php
index 08d17ae..2ebea65 100644
--- a/single.php
+++ b/single.php
@@ -9,6 +9,7 @@
 				<div class="container">
 					<?php get_sidebar(); ?>
 				</div>
-			</aside><!-- /#sidebar -->				
+			</aside><!-- /#sidebar -->			
+			<?php echo get_roots_960gs_cleardiv() ?>	
 		</div><!-- /#content -->
 <?php get_footer(); ?>