move container up in default grid mixin

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8f36dc1bb0f26b351b4dc3cd0c92e202c29afc91..c451d13a26627f032df17d960b4121de1cd775ca 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 4fa386dac0f6332c745298ee6b55569a2f99969d..a5ebd1144f83dc28c670d59064ae72819d55b036 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -174,6 +174,9 @@
     float: left;
     margin-left: 20px;
   }
+  .container {
+    width: 724px;
+  }
   .span1 {
     width: 42px;
   }
@@ -246,9 +249,6 @@
   .span24 {
     width: 1468px;
   }
-  .container {
-    width: 724px;
-  }
   .offset1 {
     margin-left: 82px;
   }
@@ -607,6 +607,9 @@
     float: left;
     margin-left: 30px;
   }
+  .container {
+    width: 1170px;
+  }
   .span1 {
     width: 70px;
   }
@@ -679,9 +682,6 @@
   .span24 {
     width: 2370px;
   }
-  .container {
-    width: 1170px;
-  }
   .offset1 {
     margin-left: 130px;
   }

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 53f93a4825223cb867a09f481f315790821a0ae5..e9fb04f2dd49eb13f6459722f37222f1401214f3 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -134,6 +134,9 @@ a:hover {
   float: left;
   margin-left: 20px;
 }
+.container {
+  width: 940px;
+}
 .span1 {
   width: 60px;
 }
@@ -206,9 +209,6 @@ a:hover {
 .span24 {
   width: 1900px;
 }
-.container {
-  width: 940px;
-}
 .offset1 {
   margin-left: 100px;
 }

diff --git a/less/mixins.less b/less/mixins.less
index 0e33591f790c81d255d8878507ba9e245002ece2..4561e98cb2829c7370c7de282f9b270b98f8bd8e 100644 (file)
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -172,6 +172,10 @@
     [class*="span"] {
       #gridSystem > .gridColumn(@gridGutterWidth);
     }
+    
+    // Fixed container
+    .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
+
     // Default columns
     .span1     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
     .span2     { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); }
@@ -198,8 +202,6 @@
     .span23    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 23); }
     .span24    { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 24); }
     
-    .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
-    
     // Offset column options
     .offset1   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
     .offset2   { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }