]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0...
authorMark Otto <otto@github.com>
Sun, 3 Feb 2013 03:08:59 +0000 (19:08 -0800)
committerMark Otto <otto@github.com>
Sun, 3 Feb 2013 03:08:59 +0000 (19:08 -0800)
1  2 
docs/assets/css/bootstrap.css
less/buttons.less

Simple merge
index 80d19494dd7ca68b36b5c79efbf7ea50b812131e,5f5955bc1663605d9713ca486288e4a67fa37b26..143ab42fd2fbcbda4d966e5b64395f66947ffb54
@@@ -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;