diff options
| author | Mark Otto <[email protected]> | 2015-04-04 23:52:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-04-04 23:52:40 -0700 |
| commit | 510f56f334087b28581d4a8d02c92eebc693a92b (patch) | |
| tree | c22fcb51754524582a968063acf12eecbe16489a /less/theme.less | |
| parent | a2c69b814509653c454c7a91b9a7ad4521808223 (diff) | |
| parent | 9c41aee780bc1008019684955be7a029679245ca (diff) | |
| download | bootstrap-510f56f334087b28581d4a8d02c92eebc693a92b.tar.xz bootstrap-510f56f334087b28581d4a8d02c92eebc693a92b.zip | |
Merge branch 'master' into fix_15830
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/less/theme.less b/less/theme.less index 6f2eb6212..afac3a8aa 100644 --- a/less/theme.less +++ b/less/theme.less @@ -28,6 +28,12 @@ .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); } + &.disabled, + &[disabled], + fieldset[disabled] & { + .box-shadow(none); + } + .badge { text-shadow: none; } @@ -53,10 +59,17 @@ } &.disabled, - &:disabled, - &[disabled] { - background-color: darken(@btn-color, 12%); - background-image: none; + &[disabled], + fieldset[disabled] & { + &, + &:hover, + &:focus, + &.focus, + &:active, + &.active { + background-color: darken(@btn-color, 12%); + background-image: none; + } } } |