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

4 files changed, 65 insertions, 23 deletions

diff --git a/lib/forms.less b/lib/forms.less
index a16844ab1..5f8a09693 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -113,11 +113,13 @@ textarea {
   height: auto;
 }
 
+// For text that needs to appear as an input but should not be an input
 .uneditable-input {
-  background-color: #eee;
+  background-color: #fff;
   display: block;
-  border-color: #ccc;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
+  border-color: #eee;
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
@@ -130,12 +132,14 @@ textarea {
 
 // Focus states
 input,
-select, textarea {
+select,
+textarea {
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
   .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
 }
 input:focus,
+select:focus,
 textarea:focus {
   outline: none;
   border-color: rgba(82,168,236,.8);
@@ -175,35 +179,56 @@ form div.error {
 }
 
 // Form element sizes
-.input-mini, input.mini, textarea.mini, select.mini {
+.input-mini,
+input.mini,
+textarea.mini,
+select.mini {
   width: 60px;
 }
-.input-small, input.small, textarea.small, select.small {
+.input-small,
+input.small,
+textarea.small,
+select.small {
   width: 90px;
 }
-.input-medium, input.medium, textarea.medium, select.medium {
+.input-medium,
+input.medium,
+textarea.medium,
+select.medium {
   width: 150px;
 }
-.input-large, input.large, textarea.large, select.large {
+.input-large,
+input.large,
+textarea.large,
+select.large {
   width: 210px;
 }
-.input-xlarge, input.xlarge, textarea.xlarge, select.xlarge {
+.input-xlarge,
+input.xlarge,
+textarea.xlarge,
+select.xlarge {
   width: 270px;
 }
-.input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge {
+.input-xxlarge,
+input.xxlarge,
+textarea.xxlarge,
+select.xxlarge {
   width: 530px;
 }
 textarea.xxlarge {
-  overflow-y: scroll;
+  overflow-y: auto;
 }
 
-// Turn off focus for disabled (read-only) form elements
-input[readonly]:focus,
-textarea[readonly]:focus,
-input.disabled {
-  background: #f5f5f5;
+// Disabled and read-only inputs
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
   border-color: #ddd;
-  .box-shadow(none);
+  cursor: not-allowed;
 }
 
 // Actions (the buttons)
diff --git a/lib/patterns.less b/lib/patterns.less
index 57e682da8..72ca3b559 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -46,6 +46,15 @@
     }
   }
 
+  // Plain text in topbar
+  p {
+    margin: 0;
+    line-height: 40px;
+    a:hover {
+      background-color: transparent;
+    }
+  }
+
   // Search Form
   form {
     float: left;
@@ -312,6 +321,7 @@ a.menu:after,
 
 // Basic Tabs
 .tabs {
+  float: left;
   width: 100%;
   border-bottom: 1px solid #ddd;
   > li {
@@ -385,7 +395,6 @@ a.menu:after,
 
 .hero-unit {
   background-color: #f5f5f5;
-  margin-top: 60px;
   margin-bottom: 30px;
   padding: 60px;
   .border-radius(6px);
diff --git a/lib/preboot.less b/lib/preboot.less
index 609870ec2..3f44e376b 100644
--- 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-right: auto;
   .clearfix();
 }
 .columns(@columnSpan: 1) {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index ea1aad68b..845c4d355 100644
--- 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)
@@ -103,6 +101,7 @@ body {
   display: block;
 }
 
+
 // BASE STYLES
 // -----------
 
@@ -117,3 +116,11 @@ a {
     text-decoration: underline;
   }
 }
+
+// Quick floats
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}