diff options
| author | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 15:38:21 -0800 |
| commit | a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3 (patch) | |
| tree | 9b1c5697a731543a86711b016e1986ec1e81dad4 /less/theme.less | |
| parent | 80e86442308b2cc86ba948de87e854057933e3ab (diff) | |
| parent | f1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e (diff) | |
| download | bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.tar.xz bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.zip | |
Merge branch 'master' into pr/10951
Conflicts:
dist/css/bootstrap.min.css
less/modals.less
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/less/theme.less b/less/theme.less index b510b7a8d..0addce3f2 100644 --- a/less/theme.less +++ b/less/theme.less @@ -33,6 +33,7 @@ // Mixin for generating new styles .btn-styles(@btn-color: #555) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); + .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners background-repeat: repeat-x; border-color: darken(@btn-color, 14%); @@ -104,6 +105,7 @@ // Default navbar .navbar-default { #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg); + .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); @@ -121,6 +123,7 @@ // Inverted navbar .navbar-inverse { #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg); + .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered .navbar-nav > .active > a { #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); |