1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

nuke bg image on active/open for buttons for when we add gradients

This commit is contained in:
Mark Otto 2013-08-15 16:17:44 -07:00
parent 7ab52272d7
commit 7cd35f0cb6
4 changed files with 44 additions and 2 deletions

View file

@ -1942,6 +1942,7 @@ textarea.input-lg {
.btn:active, .btn:active,
.btn.active { .btn.active {
background-image: none;
outline: 0; outline: 0;
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); -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); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@ -1974,6 +1975,12 @@ fieldset[disabled] .btn {
border-color: #adadad; border-color: #adadad;
} }
.btn-default:active,
.btn-default.active,
.open .dropdown-toggle.btn-default {
background-image: none;
}
.btn-default.disabled, .btn-default.disabled,
.btn-default[disabled], .btn-default[disabled],
fieldset[disabled] .btn-default, fieldset[disabled] .btn-default,
@ -2009,6 +2016,12 @@ fieldset[disabled] .btn-default.active {
border-color: #285e8e; border-color: #285e8e;
} }
.btn-primary:active,
.btn-primary.active,
.open .dropdown-toggle.btn-primary {
background-image: none;
}
.btn-primary.disabled, .btn-primary.disabled,
.btn-primary[disabled], .btn-primary[disabled],
fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary,
@ -2044,6 +2057,12 @@ fieldset[disabled] .btn-primary.active {
border-color: #d58512; border-color: #d58512;
} }
.btn-warning:active,
.btn-warning.active,
.open .dropdown-toggle.btn-warning {
background-image: none;
}
.btn-warning.disabled, .btn-warning.disabled,
.btn-warning[disabled], .btn-warning[disabled],
fieldset[disabled] .btn-warning, fieldset[disabled] .btn-warning,
@ -2079,6 +2098,12 @@ fieldset[disabled] .btn-warning.active {
border-color: #ac2925; border-color: #ac2925;
} }
.btn-danger:active,
.btn-danger.active,
.open .dropdown-toggle.btn-danger {
background-image: none;
}
.btn-danger.disabled, .btn-danger.disabled,
.btn-danger[disabled], .btn-danger[disabled],
fieldset[disabled] .btn-danger, fieldset[disabled] .btn-danger,
@ -2114,6 +2139,12 @@ fieldset[disabled] .btn-danger.active {
border-color: #398439; border-color: #398439;
} }
.btn-success:active,
.btn-success.active,
.open .dropdown-toggle.btn-success {
background-image: none;
}
.btn-success.disabled, .btn-success.disabled,
.btn-success[disabled], .btn-success[disabled],
fieldset[disabled] .btn-success, fieldset[disabled] .btn-success,
@ -2149,6 +2180,12 @@ fieldset[disabled] .btn-success.active {
border-color: #269abc; border-color: #269abc;
} }
.btn-info:active,
.btn-info.active,
.open .dropdown-toggle.btn-info {
background-image: none;
}
.btn-info.disabled, .btn-info.disabled,
.btn-info[disabled], .btn-info[disabled],
fieldset[disabled] .btn-info, fieldset[disabled] .btn-info,

File diff suppressed because one or more lines are too long

View file

@ -35,6 +35,7 @@
&:active, &:active,
&.active { &.active {
outline: 0; outline: 0;
background-image: none;
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }

View file

@ -418,7 +418,11 @@
background-color: darken(@background, 8%); background-color: darken(@background, 8%);
border-color: darken(@border, 12%); border-color: darken(@border, 12%);
} }
&:active,
&.active,
.open .dropdown-toggle& {
background-image: none;
}
&.disabled, &.disabled,
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {