updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code

1 files changed, 17 insertions, 6 deletions

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 543aa4d16..b2bcc20b3 100644
--- 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;