Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer

Conflicts:
	docs/assets/bootstrap.zip

2 files changed, 12 insertions, 4 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 906485e6d..9dd71c62d 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -161,7 +161,10 @@
   .span11 {
     width: 662px;
   }
-  .span12, .container {
+  .span12 {
+    width: 724px;
+  }
+  .container {
     width: 724px;
   }
   .offset1 {
@@ -447,7 +450,10 @@
   .span11 {
     width: 1070px;
   }
-  .span12, .container {
+  .span12 {
+    width: 1170px;
+  }
+  .container {
     width: 1170px;
   }
   .offset1 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fac71d57b..0875a146c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -168,7 +168,10 @@ a:hover {
 .span11 {
   width: 860px;
 }
-.span12, .container {
+.span12 {
+  width: 940px;
+}
+.container {
   width: 940px;
 }
 .offset1 {
@@ -259,7 +262,6 @@ a:hover {
   width: 99.99999998999999%;
 }
 .container {
-  width: 940px;
   margin-left: auto;
   margin-right: auto;
   *zoom: 1;