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

4 files changed, 24 insertions, 12 deletions

diff --git a/lib/forms.less b/lib/forms.less
index d6b1a693d..0da4037df 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -111,6 +111,11 @@ input[type=file] {
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
 }
 
+// Make multiple select elements height not fixed
+select[multiple] {
+  height: inherit;
+}
+
 textarea {
   height: auto;
 }
diff --git a/lib/patterns.less b/lib/patterns.less
index 543332086..ce387614e 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -342,22 +342,22 @@ a.menu:after,
     position: relative; // For the dropdowns mostly
     top: 1px;
     > a {
-      margin-right: 2px;
       padding: 0 15px;
-      line-height: (@baseline * 2) - 1;
+      margin-right: 2px;
+      line-height: @baseline * 2;
+      border: 1px solid transparent;
       .border-radius(4px 4px 0 0);
       &:hover {
-        background-color: #eee;
-        border-bottom: 1px solid #ddd;
         text-decoration: none;
+        background-color: #eee;
+        border-color: #eee #eee #ddd;
       }
     }
     &.active > a {
+      color: @gray;
       background-color: @white;
-      padding: 0 14px;
       border: 1px solid #ddd;
-      border-bottom: 0;
-      color: @gray;
+      border-bottom-color: transparent;
     }
   }
   // first one for backwards compatibility
@@ -641,6 +641,11 @@ input[type=submit].btn {
   .border-radius(4px);
   .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
 
+  // Adjust close icon
+  .close {
+    *margin-top: 3px; /* IE7 spacing */
+  }
+
   // Remove extra margin from content
   h5 {
     line-height: @baseline;
@@ -915,8 +920,8 @@ input[type=submit].btn {
     height: 0;
   }
   .inner {
-    background: #333;
-    background: rgba(0,0,0,.8);
+    background-color: @black;
+    background-color: rgba(0,0,0,.8);
     padding: 3px;
     overflow: hidden;
     width: 280px;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index e4afa5aeb..13cc4f2b1 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -33,17 +33,17 @@ body {
   }
   // TODO in v2: rename this and .popover .content to be more specific
   > .content {
+    float: left;
     min-width: 700px;
     max-width: 1180px;
-    margin-left: 240px;
-    .clearfix();
+    margin-left: 20px;
   }
 }
 
+// Toggling content
 .hide {
   display: none;
 }
-
 .show {
   display: block;
 }
diff --git a/lib/tables.less b/lib/tables.less
index 886d8bedd..988483f0e 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -11,6 +11,8 @@ table {
   width: 100%;
   margin-bottom: @baseline;
   padding: 0;
+  border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapse; /* IE7, collapse table to remove spacing */
   font-size: @basefont;
   border: 1px solid #ddd;
   .border-radius(4px);