Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

1 files changed, 46 insertions, 19 deletions

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 6beafa28b..1280c5148 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:06:46 PDT 2011
+ * Date: Fri Sep  2 23:08:36 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-right: 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,
@@ -396,6 +397,15 @@ body {
   width: 940px;
   margin-left: auto;
   margin-right: auto;
+  zoom: 1;
+  margin-bottom: 18px;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+}
+.container:after {
+  clear: both;
 }
 .container-fluid {
   padding-left: 20px;
@@ -435,6 +445,12 @@ a:hover {
   color: #0050a3;
   text-decoration: underline;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
 /* Typography.less
  * Headings, body text, lists, code, and more for a versatile and durable typography system
  * ---------------------------------------------------------------------------------------- */
@@ -713,12 +729,13 @@ textarea {
   height: auto;
 }
 .uneditable-input {
-  background-color: #eee;
+  background-color: #fff;
   display: block;
-  border-color: #ccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
+  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;
@@ -736,7 +753,7 @@ input, select, textarea {
   -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);
 }
-input:focus, textarea:focus {
+input:focus, select:focus, textarea:focus {
   outline: none;
   border-color: rgba(82, 168, 236, 0.8);
   -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -808,14 +825,17 @@ select.xxlarge {
   width: 530px;
 }
 textarea.xxlarge {
-  overflow-y: scroll;
-}
-input[readonly]:focus, textarea[readonly]:focus, input.disabled {
-  background: #f5f5f5;
+  overflow-y: auto;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
   border-color: #ddd;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
+  cursor: not-allowed;
 }
 .actions {
   background: #f5f5f5;
@@ -1145,6 +1165,13 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   font-weight: 200;
   line-height: 1;
 }
+.topbar p {
+  margin: 0;
+  line-height: 40px;
+}
+.topbar p a:hover {
+  background-color: transparent;
+}
 .topbar form {
   float: left;
   margin: 5px 0 0 0;
@@ -1446,6 +1473,7 @@ a.menu:after, .dropdown-toggle:after {
   display: block;
 }
 .tabs {
+  float: left;
   width: 100%;
   border-bottom: 1px solid #ddd;
 }
@@ -1510,7 +1538,6 @@ a.menu:after, .dropdown-toggle:after {
 }
 .hero-unit {
   background-color: #f5f5f5;
-  margin-top: 60px;
   margin-bottom: 30px;
   padding: 60px;
   -webkit-border-radius: 6px;