Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/buttons.less b/lib/buttons.less
index 7f5a91b99..228b6c06d 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -36,7 +36,11 @@
   .gradientBar(@startColor, @endColor);
 
   // in these cases the gradient won't cover the background, so we override
-  &:hover, &:active, &.active {
+  &:hover, &:active, &.active, &.disabled {
+    background-color: @endColor;
+  }
+
+  &[disabled] {
     background-color: @endColor;
   }
 
@@ -92,6 +96,7 @@
   &.disabled {
     cursor: default;
     background-image: none;
+    background-color: darken(@white, 10%);
     .opacity(65);
     .box-shadow(none);
   }
@@ -100,6 +105,7 @@
     // def because IE8 and below will drop it ;_;
     cursor: default;
     background-image: none;
+    background-color: darken(@white, 10%);
     .opacity(65);
     .box-shadow(none);
   }
diff --git a/lib/mixins.less b/lib/mixins.less
index b8c969ea8..dd331ebf2 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -287,7 +287,7 @@
     background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
   }
   .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
-    background-color: @midColor;
+    background-color: mix(@midColor, @endColor, 80%);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
     background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
     background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);