From 43c21a52b525de4629882462401cf50b2fc17ac9 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Wed, 10 Aug 2011 20:49:06 -0600
Subject: [PATCH] fixes #93 - 1140 grid fixes: wrapping the row's with
 container's and setting a better default container class

---
 inc/roots-actions.php | 12 ++++++------
 inc/roots-options.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inc/roots-actions.php b/inc/roots-actions.php
index 5057412..2c61eff 100644
--- a/inc/roots-actions.php
+++ b/inc/roots-actions.php
@@ -136,7 +136,7 @@ function roots_1140_header_before() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo '<div class="row">', "\n";
+		echo '<div class="container"><div class="row">', "\n";
 	}	
 }
 
@@ -144,8 +144,8 @@ function roots_1140_header_after() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "</div><!-- /.row -->\n";
-		echo '<div class="row">', "\n";
+		echo "</div></div><!-- /.row /.container -->\n";
+		echo '<div class="container"><div class="row">', "\n";
 	}	
 }
 
@@ -153,8 +153,8 @@ function roots_1140_footer_before() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "</div><!-- /.row -->\n";
-    echo '<div class="row">', "\n";
+		echo "</div></div><!-- /.row /.container -->\n";
+    echo '<div class="container"><div class="row">', "\n";
 	}	
 }
 
@@ -162,7 +162,7 @@ function roots_1140_footer_after() {
 	global $roots_options;
 	$roots_css_framework = $roots_options['css_framework'];
 	if ($roots_css_framework === '1140') {
-		echo "</div><!-- /.row -->\n";
+		echo "</div></div><!-- /.row /.container -->\n";
 	}	
 }
 
diff --git a/inc/roots-options.php b/inc/roots-options.php
index 81edeca..c18f825 100644
--- a/inc/roots-options.php
+++ b/inc/roots-options.php
@@ -94,7 +94,7 @@ $roots_css_frameworks = array(
 		'name'     => '1140',
 		'label'   => __('1140', 'roots'),
 		'classes' => array(
-			'container' => 'container',
+			'container' => 'twelvecol',
 			'main'    => 'sevencol',
 			'sidebar' => 'fourcol last'
 		)