From: Mark Otto <otto@github.com>
Date: Sun, 3 Feb 2013 03:08:59 +0000 (-0800)
Subject: Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0... 
X-Git-Tag: v3.0.0-rc1~712
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f7087eae9790626b46223445b6406ff59b7a56e;p=thirdparty%2Fbootstrap.git

Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip
---

2f7087eae9790626b46223445b6406ff59b7a56e
diff --cc less/buttons.less
index 80d19494dd,5f5955bc16..143ab42fd2
--- a/less/buttons.less
+++ b/less/buttons.less
@@@ -115,15 -134,10 +134,10 @@@ input[type="button"] 
  // --------------------------------------------------
  
  .btn {
 -  color: #fff;
 +  color: @btn-color;
    background-color: @btn-background;
-   border-color: @btn-border;
-   &:hover,
-   &:focus,
-   &:active {
-     background-color: darken(@btn-background, 5%);
-         border-color: darken(@btn-border, 10%);
-   }
+       border-color: @btn-border;
+   .darken-button-states(@btn-background, @btn-border)
  }
  .btn-primary {
    background-color: @btn-background-primary;