updated container mixin to be fixed-container instead so we can keep the .container...

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 543aa4d16788208fa9d22efe2a00654ff8ce0717..b2bcc20b3397f25d76cd64b8917a79991cab543c 100644 (file)
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep  2 21:53:08 PDT 2011
+ * Date: Fri Sep  2 22:08:17 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -185,17 +185,18 @@ textarea {
   margin-left: auto;
   margin-right: auto;
 }
-.container {
+.fixed-container {
   width: 940px;
-  margin: 0 auto;
+  margin-left: auto;
+  margin-left: auto;
   zoom: 1;
   margin-bottom: 18px;
 }
-.container:before, .container:after {
+.fixed-container:before, .fixed-container:after {
   display: table;
   content: "";
 }
-.container:after {
+.fixed-container:after {
   clear: both;
 }
 .btn.danger,
@@ -395,7 +396,16 @@ body {
 .container {
   width: 940px;
   margin-left: auto;
-  margin-right: auto;
+  margin-left: auto;
+  zoom: 1;
+  margin-bottom: 18px;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+}
+.container:after {
+  clear: both;
 }
 .container-fluid {
   padding-left: 20px;
@@ -713,6 +723,7 @@ textarea {
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
 }
 :-moz-placeholder {
   color: #bfbfbf;

diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index e7b99664241e7e0bcf9a09c606a495756bb73359..a294e905e767347ca1d960daf5454e15c7de21f5 100644 (file)
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -22,8 +22,8 @@ textarea{overflow:auto;vertical-align:top;}
 .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
 .clearfix:after{clear:both;}
 .center-block{display:block;margin-left:auto;margin-right:auto;}
-.container{width:940px;margin:0 auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";}
-.container:after{clear:both;}
+.fixed-container{width:940px;margin-left:auto;margin-left:auto;zoom:1;margin-bottom:18px;}.fixed-container:before,.fixed-container:after{display:table;content:"";}
+.fixed-container:after{clear:both;}
 .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
 .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 .btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
@@ -65,7 +65,8 @@ textarea{overflow:auto;vertical-align:top;}
 .row .offset-two-thirds{margin-left:660px;}
 html,body{background-color:#fff;}
 body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;}
-.container{width:940px;margin-left:auto;margin-right:auto;}
+.container{width:940px;margin-left:auto;margin-left:auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
 .container-fluid{padding-left:20px;padding-right:20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
 .container-fluid:after{clear:both;}
 .container-fluid>.sidebar{float:left;width:220px;}
@@ -112,7 +113,7 @@ input[type=file]{background-color:#fff;padding:initial;border:initial;line-heigh
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
 select,input[type=file]{height:27px;line-height:27px;}
 textarea{height:auto;}
-.uneditable-input{background-color:#fff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);}
+.uneditable-input{background-color:#fff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
 :-moz-placeholder{color:#bfbfbf;}
 ::-webkit-input-placeholder{color:#bfbfbf;}
 input,select,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}

diff --git a/lib/preboot.less b/lib/preboot.less
index d840ad1a6101bfa865e2bb972603abe32e3a09bc..adbbc676ea5a0a8cc31f4471165aded5b7604d89 100644 (file)
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -121,9 +121,10 @@
 }
 
 // Grid System
-.container {
+.fixed-container {
   width: @siteWidth;
-  margin: 0 auto;
+  margin-left: auto;
+  margin-left: auto;
   .clearfix();
 }
 .columns(@columnSpan: 1) {

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index b7c44e652a801fd0b2e3c8fd606ff6e7168f0cdd..10af26c16df5b88d0d0bc58ff645d0f5d52725e1 100644 (file)
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -73,9 +73,7 @@ body {
 
 // Container (centered, fixed-width layouts)
 .container {
-  width: @siteWidth;
-  margin-left: auto;
-  margin-right: auto;
+  .fixed-container();
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)