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

4 files changed, 11 insertions, 1 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 471d33748..3e08e6b09 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -73,7 +73,8 @@
 // On hover/focus/active, bring the proper btn to front
 .btn-group .btn:hover,
 .btn-group .btn:focus,
-.btn-group .btn:active {
+.btn-group .btn:active,
+.btn-group .btn.active {
   z-index: 2;
 }
 
diff --git a/less/buttons.less b/less/buttons.less
index 8d75248b3..f1060dc6b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -18,6 +18,12 @@
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     color: @white
   }
+  &.primary.active,
+  &.danger.active,
+  &.success.active,
+  &.info.active {
+    color: rgba(255,255,255,.75);
+  }
   &.primary {
     .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
   }
@@ -81,6 +87,7 @@
     .box-shadow(@shadow);
     background-color: darken(@white, 10%);
     background-color: darken(@white, 15%) e("\9");
+    color: rgba(0,0,0,.5);
   }
   &.disabled,
   &[disabled] {
diff --git a/less/forms.less b/less/forms.less
index edd416585..b82fcca72 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -505,6 +505,7 @@ select:focus:required:invalid {
   // Increase spacing between groups
   .control-group {
     margin-bottom: @baseLineHeight;
+    .clearfix();
   }
   // Float the labels left
   .control-group > label {
diff --git a/less/navbar.less b/less/navbar.less
index 6f2b737c8..287459a27 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -244,6 +244,7 @@
 
 // Right aligned menus need alt position
 .navbar .nav.pull-right .dropdown-menu {
+  left: auto;
   right: 0;
   &:before {
     left: auto;