diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-10-21 10:33:17 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-10-21 10:33:17 -0300 |
| commit | 2d14c4b384c7000e264674a92b16e010a510ac05 (patch) | |
| tree | 7676db09f338e46e053170b1c9f7594120b9d434 /bower_components/bootstrap/less/theme.less | |
| parent | 2d2e97ac540c94e15ac5eccc7d32f3dfb3eea1bc (diff) | |
| parent | 5ec02211214350ee558fd9f6bb052264fd24f75e (diff) | |
Merge tag 'upstream/7.1.0'
Upstream version 7.1.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 6f957fb..b089424 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(); +} // |