Merge pull request #8625 from liuyl/fixbtnbg

Fix #8623

Merge pull request #8625 from liuyl/fixbtnbg
Fix #8623
099e9709 · Mark Otto · 2d91e91b · e4300fa1 · 099e9709 · 099e9709
Commit 099e9709 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 5 deletions
+1 -5
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1728,7 +1728,6 @@ select.input-small {

 .btn:active,
 .btn.active {
-  background-image: none;
  outline: 0;
  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@@ -1955,7 +1954,6 @@ fieldset[disabled] .btn-info.active {
 .btn-link[disabled],
 fieldset[disabled] .btn-link {
  background-color: transparent;
-  background-image: none;
  -webkit-box-shadow: none;
          box-shadow: none;
 }

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -34,7 +34,6 @@
  &:active,
  &.active {
    outline: 0;
-    background-image: none;
    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
  }

@@ -92,7 +91,6 @@
  &[disabled],
  fieldset[disabled] & {
    background-color: transparent;
-    background-image: none;
    .box-shadow(none);
  }
  &,