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

7 files changed, 34 insertions, 22 deletions

diff --git a/less/buttons.less b/less/buttons.less
index f3cb1bdef..a1d8989b6 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -170,8 +170,9 @@ input[type="submit"].btn {
   }
 
   // IE7 has some default padding on button controls
-  *padding-top: 2px;
-  *padding-bottom: 2px;
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+
   &.btn-large {
     *padding-top: 7px;
     *padding-bottom: 7px;
diff --git a/less/component-animations.less b/less/component-animations.less
index d614263a7..2166776d9 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -15,6 +15,7 @@
   position: relative;
   height: 0;
   overflow: hidden;
+  overflow: visible \9;
   .transition(height .35s ease);
   &.in {
     height: auto;
diff --git a/less/forms.less b/less/forms.less
index 0b3f10cb0..02ea7a518 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -132,8 +132,9 @@ input[type="color"],
 // Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"] {
-  margin: 4px 0;
+  margin: 4px 0 0;
   *margin-top: 0; /* IE7 */
+  margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
   cursor: pointer;
 }
@@ -151,9 +152,9 @@ input[type="checkbox"] {
 // Set the height of select and file controls to match text inputs
 select,
 input[type="file"] {
-  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: 28px;
+  line-height: 30px;
 }
 
 // Make select elements obey height by applying a border
diff --git a/less/mixins.less b/less/mixins.less
index 1b2f0bcfb..20dd0d19a 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -154,11 +154,12 @@
 .input-block-level {
   display: block;
   width: 100%;
-  min-height: 28px;        // Make inputs at least the height of their button counterpart
+  min-height: 30px;        // Make inputs at least the height of their button counterpart
   .box-sizing(border-box); // Makes inputs behave like true block-level elements
 }
 
 
+
 // Mixin for form field states
 .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
   // Set the text color
@@ -605,7 +606,7 @@
 
     .offset (@columns) {
       margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
-	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
+  	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
     }
 
     .offsetFirstChild (@columns) {
diff --git a/less/navbar.less b/less/navbar.less
index 4306047c7..fc8f782db 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -47,9 +47,7 @@
   float: left;
   display: block;
   // Vertically center the text given @navbarHeight
-  @elementHeight: 20px;
-  @heightDifference: @navbarHeight - @elementHeight;
-  padding: ((@heightDifference / 2) - 2) 20px ((@heightDifference / 2) + 2);
+  padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2);
   margin-left: -20px; // negative indent to left-align the text down the page
   font-size: 20px;
   font-weight: 200;
@@ -153,6 +151,9 @@
   left: 0;
   z-index: @zindexFixedNavbar;
   margin-bottom: 0; // remove 18px margin for static navbar
+  .navbar-inner {
+    border: 0;
+  }
 }
 .navbar-fixed-top .navbar-inner,
 .navbar-fixed-bottom .navbar-inner {
@@ -161,6 +162,7 @@
   .border-radius(0);
 }
 
+// Reset container width
 .navbar-fixed-top .container,
 .navbar-fixed-bottom .container {
   #grid > .core > .span(@gridColumns);
@@ -170,7 +172,6 @@
 .navbar-fixed-top {
   top: 0;
   .navbar-inner {
-    border-width: 0 0 1px;
     .box-shadow(0 1px 10px rgba(0,0,0,.1));
   }
 }
@@ -179,7 +180,6 @@
 .navbar-fixed-bottom {
   bottom: 0;
   .navbar-inner {
-    border-width: 1px 0 0;
     .box-shadow(0 -1px 10px rgba(0,0,0,.1));
   }
 }
@@ -207,8 +207,7 @@
 .navbar .nav > li > a {
   float: none;
   // Vertically center the text given @navbarHeight
-  @elementHeight: 20px;
-  padding: ((@navbarHeight - @elementHeight) / 2) 15px ((@navbarHeight - @elementHeight) / 2);
+  padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
   color: @navbarLinkColor;
   text-decoration: none;
   text-shadow: 0 1px 0 @navbarBackgroundHighlight;
@@ -266,7 +265,7 @@
 // --------------
 
 // Menu position and menu carets
-.navbar .dropdown-menu {
+.navbar .nav > li > .dropdown-menu {
   &:before {
     content: '';
     display: inline-block;
@@ -290,7 +289,7 @@
   }
 }
 // Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .dropdown-menu {
+.navbar-fixed-bottom .nav > li > .dropdown-menu {
   &:before {
     border-top: 7px solid #ccc;
     border-top-color: @dropdownBorder;
@@ -325,8 +324,8 @@
 }
 
 // Right aligned menus need alt position
-.navbar .pull-right .dropdown-menu,
-.navbar .dropdown-menu.pull-right {
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
   left: auto;
   right: 0;
   &:before {
@@ -337,6 +336,13 @@
     left: auto;
     right: 13px;
   }
+  .dropdown-menu {
+    left: auto;
+    right: 100%;
+    margin-left: 0;
+    margin-right: -1px;
+    .border-radius(6px 0 6px 6px);
+  }
 }
 
 
diff --git a/less/tables.less b/less/tables.less
index 3d571fe54..853b97e39 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -159,9 +159,11 @@ table {
 // ------------
 // Placed here since it has to come after the potential zebra striping
 .table-hover {
-  tr:hover td,
-  tr:hover th {
-    background-color: @tableBackgroundHover;
+  tbody {
+    tr:hover td,
+    tr:hover th {
+      background-color: @tableBackgroundHover;
+    }
   }
 }
 
diff --git a/less/thumbnails.less b/less/thumbnails.less
index f229a2dad..99b09dd86 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -27,7 +27,7 @@
 .thumbnail {
   display: block;
   padding: 4px;
-  line-height: 20px;
+  line-height: @baseLineHeight;
   border: 1px solid #ddd;
   .border-radius(4px);
   .box-shadow(0 1px 3px rgba(0,0,0,.055));