Skip to content

B
bootstrap
Commit 2e8a146b authored by Mark Otto's avatar Mark Otto
Browse files
Options

remove gradients from dropdown menu items on hover/active (fixes #9473)

parent 3a670545
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 22 deletions
dist/css/bootstrap.css
View file @ 2e8a146b
...@@ -2300,7 +2300,7 @@ textarea.input-group-lg > .input-group-btn > .btn { ...@@ -2300,7 +2300,7 @@ textarea.input-group-lg > .input-group-btn > .btn {
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon, .input-group-sm > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-sm > .input-group-btn > .btn {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
...@@ -2310,14 +2310,14 @@ textarea.input-group-lg > .input-group-btn > .btn { ...@@ -2310,14 +2310,14 @@ textarea.input-group-lg > .input-group-btn > .btn {
select.input-group-sm > .form-control, select.input-group-sm > .form-control,
select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn { select.input-group-sm > .input-group-btn > .btn {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-group-sm > .form-control, textarea.input-group-sm > .form-control,
textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-addon,
textarea.input-group-lg > .input-group-btn > .btn { textarea.input-group-sm > .input-group-btn > .btn {
height: auto; height: auto;
} }
...@@ -2479,13 +2479,7 @@ textarea.input-group-lg > .input-group-btn > .btn { ...@@ -2479,13 +2479,7 @@ textarea.input-group-lg > .input-group-btn > .btn {
.dropdown-menu > li > a:focus { .dropdown-menu > li > a:focus {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
background-color: #357ebd; background-color: #428bca;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
} }
.dropdown-menu > .active > a, .dropdown-menu > .active > a,
...@@ -2493,14 +2487,8 @@ textarea.input-group-lg > .input-group-btn > .btn { ...@@ -2493,14 +2487,8 @@ textarea.input-group-lg > .input-group-btn > .btn {
.dropdown-menu > .active > a:focus { .dropdown-menu > .active > a:focus {
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
background-color: #357ebd; background-color: #428bca;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
background-repeat: repeat-x;
outline: 0; outline: 0;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
} }
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a,
......
dist/css/bootstrap.min.css
View file @ 2e8a146b
This source diff could not be displayed because it is too large. You can view the blob instead.
less/dropdowns.less
View file @ 2e8a146b
...@@ -75,8 +75,7 @@ ...@@ -75,8 +75,7 @@
&:focus { &:focus {
text-decoration: none; text-decoration: none;
color: @dropdown-link-hover-color; color: @dropdown-link-hover-color;
#gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%)); background-color: @dropdown-link-hover-bg;
background-color: darken(@dropdown-link-hover-bg, 5%);
} }
} }
...@@ -88,8 +87,7 @@ ...@@ -88,8 +87,7 @@
color: @dropdown-link-active-color; color: @dropdown-link-active-color;
text-decoration: none; text-decoration: none;
outline: 0; outline: 0;
#gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%)); background-color: @dropdown-link-active-bg;
background-color: darken(@dropdown-link-active-bg, 5%);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment