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

Conflicts:
	docs/assets/bootstrap.zip

4 files changed, 14 insertions, 7 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 549d70fe2..cdbb2c88e 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
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;
diff --git a/less/mixins.less b/less/mixins.less
index cea318c28..0d9436e2f 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -142,7 +142,6 @@
 // Site container
 // -------------------------
 .container-fixed() {
-  width: @gridRowWidth;
   margin-left: auto;
   margin-right: auto;
   .clearfix();
@@ -185,8 +184,8 @@
     .span9     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
     .span10    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
     .span11    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
-    .span12,
-    .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
+    .span12    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
+    .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
     // Offset column options
     .offset1   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
     .offset2   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }