Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
30d8eb3e
Commit
30d8eb3e
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
parents
3f493f0d
0a1434b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+8
-8
docs/assets/css/bootstrap.css
less/dropdowns.less
+8
-8
less/dropdowns.less
with
16 additions
and
16 deletions
+16
-16
docs/assets/css/bootstrap.css
+
8
-
8
View file @
30d8eb3e
...
...
@@ -2911,7 +2911,7 @@ table th[class*="span"],
border-bottom
:
1px
solid
#ffffff
;
}
.dropdown-menu
li
>
a
{
.dropdown-menu
>
li
>
a
{
display
:
block
;
padding
:
3px
20px
;
clear
:
both
;
...
...
@@ -2921,8 +2921,8 @@ table th[class*="span"],
white-space
:
nowrap
;
}
.dropdown-menu
li
>
a
:hover
,
.dropdown-menu
li
>
a
:focus
,
.dropdown-menu
>
li
>
a
:hover
,
.dropdown-menu
>
li
>
a
:focus
,
.dropdown-submenu
:hover
>
a
{
color
:
#ffffff
;
text-decoration
:
none
;
...
...
@@ -2936,8 +2936,8 @@ table th[class*="span"],
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff0088cc'
,
endColorstr
=
'#ff0077b3'
,
GradientType
=
0
);
}
.dropdown-menu
.active
>
a
,
.dropdown-menu
.active
>
a
:hover
{
.dropdown-menu
>
.active
>
a
,
.dropdown-menu
>
.active
>
a
:hover
{
color
:
#ffffff
;
text-decoration
:
none
;
background-color
:
#0081c2
;
...
...
@@ -2951,12 +2951,12 @@ table th[class*="span"],
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff0088cc'
,
endColorstr
=
'#ff0077b3'
,
GradientType
=
0
);
}
.dropdown-menu
.disabled
>
a
,
.dropdown-menu
.disabled
>
a
:hover
{
.dropdown-menu
>
.disabled
>
a
,
.dropdown-menu
>
.disabled
>
a
:hover
{
color
:
#999999
;
}
.dropdown-menu
.disabled
>
a
:hover
{
.dropdown-menu
>
.disabled
>
a
:hover
{
text-decoration
:
none
;
cursor
:
default
;
background-color
:
transparent
;
...
...
This diff is collapsed.
Click to expand it.
less/dropdowns.less
+
8
-
8
View file @
30d8eb3e
...
...
@@ -72,7 +72,7 @@
}
// Links within the dropdown menu
li > a {
>
li > a {
display: block;
padding: 3px 20px;
clear: both;
...
...
@@ -85,8 +85,8 @@
// Hover state
// -----------
.dropdown-menu li > a:hover,
.dropdown-menu li > a:focus,
.dropdown-menu
>
li > a:hover,
.dropdown-menu
>
li > a:focus,
.dropdown-submenu:hover > a {
text-decoration: none;
color: @dropdownLinkColorHover;
...
...
@@ -95,8 +95,8 @@
// Active state
// ------------
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
.dropdown-menu
>
.active > a,
.dropdown-menu
>
.active > a:hover {
color: @dropdownLinkColorActive;
text-decoration: none;
outline: 0;
...
...
@@ -106,12 +106,12 @@
// Disabled state
// --------------
// Gray out text and ensure the hover state remains gray
.dropdown-menu .disabled > a,
.dropdown-menu .disabled > a:hover {
.dropdown-menu
>
.disabled > a,
.dropdown-menu
>
.disabled > a:hover {
color: @grayLight;
}
// Nuke hover effects
.dropdown-menu .disabled > a:hover {
.dropdown-menu
>
.disabled > a:hover {
text-decoration: none;
background-color: transparent;
background-image: none; // Remove CSS gradient
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment