diff options
author | Thomas Park <thomas@thomaspark.me> | 2014-06-27 01:07:56 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2014-06-27 01:07:56 -0400 |
commit | f3189e26cff5142e200568a81ef3db608530cc6f (patch) | |
tree | 00efe6915ac2ca82e175dbdcb15085b2e90c5ca6 /bower_components/bootstrap/less/theme.less | |
parent | 25f107274a4a05e2be8d1c0a7ae77c19f8da5fa9 (diff) |
3.1.1 -> 3.2.0
Diffstat (limited to 'bower_components/bootstrap/less/theme.less')
-rw-r--r-- | bower_components/bootstrap/less/theme.less | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bower_components/bootstrap/less/theme.less b/bower_components/bootstrap/less/theme.less index 6f957fb3..b089424c 100644 --- a/bower_components/bootstrap/less/theme.less +++ b/bower_components/bootstrap/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(); +} // |