diff options
| author | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
| commit | 0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch) | |
| tree | 7b88c388d526ada7b564f1faf44cda92276f2722 /less/theme.less | |
| parent | f071549c8408241b88a95192e477816d2402eb6e (diff) | |
| parent | b31c35b63629ec750f338a646f6b730bd675b734 (diff) | |
| download | bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip | |
Merge branch 'master' into fix-13386
Conflicts:
js/carousel.js
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/less/theme.less b/less/theme.less index 6f957fb39..b089424cf 100644 --- a/less/theme.less +++ b/less/theme.less @@ -48,6 +48,12 @@ background-color: darken(@btn-color, 12%); border-color: darken(@btn-color, 14%); } + + &:disabled, + &[disabled] { + background-color: darken(@btn-color, 12%); + background-image: none; + } } // Common styles @@ -191,6 +197,11 @@ .progress-bar-warning { .progress-bar-styles(@progress-bar-warning-bg); } .progress-bar-danger { .progress-bar-styles(@progress-bar-danger-bg); } +// Reset the striped class because our mixins don't do multiple gradients and +// the above custom styles override the new `.progress-bar-striped` in v3.2.0. +.progress-bar-striped { + #gradient > .striped(); +} // |