Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
4b79443b
Commit
4b79443b
authored
Jan 08, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix dropdowns for active state in dropdown menus
parent
ac68bc39
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
15 deletions
+62
-15
bootstrap.css
bootstrap.css
+18
-5
bootstrap.min.css
bootstrap.min.css
+7
-4
lib/dropdowns.less
lib/dropdowns.less
+10
-3
lib/navs.less
lib/navs.less
+27
-3
No files found.
bootstrap.css
View file @
4b79443b
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 8 1
4:33:06
PST 2012
* Date: Sun Jan 8 1
5:33:29
PST 2012
*/
*/
html
,
body
{
html
,
body
{
margin
:
0
;
margin
:
0
;
...
@@ -1493,7 +1493,7 @@ i {
...
@@ -1493,7 +1493,7 @@ i {
line-height
:
18px
;
line-height
:
18px
;
color
:
#555555
;
color
:
#555555
;
}
}
.dropdown-menu
a
:hover
,
.dropdown-menu
.active
>
a
{
.dropdown-menu
li
>
a
:hover
{
color
:
#fff
;
color
:
#fff
;
text-decoration
:
none
;
text-decoration
:
none
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
...
@@ -1511,6 +1511,11 @@ i {
...
@@ -1511,6 +1511,11 @@ i {
-moz-box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
-moz-box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
}
}
.dropdown-menu
.active
>
a
,
.dropdown-menu
.active
>
a
:hover
{
color
:
#fff
;
background-color
:
#999
;
background-image
:
none
;
}
.dropdown.open
.dropdown-toggle
{
.dropdown.open
.dropdown-toggle
{
color
:
#ffffff
;
color
:
#ffffff
;
background
:
#ccc
;
background
:
#ccc
;
...
@@ -1870,7 +1875,7 @@ i {
...
@@ -1870,7 +1875,7 @@ i {
.tabs
>
li
>
a
:hover
{
.tabs
>
li
>
a
:hover
{
border-color
:
#eee
#eee
#ddd
;
border-color
:
#eee
#eee
#ddd
;
}
}
.tabs
.active
>
a
,
.tabs
.active
>
a
:hover
{
.tabs
>
.active
>
a
,
.tabs
>
.active
>
a
:hover
{
color
:
#555555
;
color
:
#555555
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
border
:
1px
solid
#ddd
;
border
:
1px
solid
#ddd
;
...
@@ -1941,11 +1946,19 @@ i {
...
@@ -1941,11 +1946,19 @@ i {
.tabs
.dropdown-toggle
:hover
.caret
,
.pills
.dropdown-toggle
:hover
.caret
{
.tabs
.dropdown-toggle
:hover
.caret
,
.pills
.dropdown-toggle
:hover
.caret
{
border-top-color
:
#005580
;
border-top-color
:
#005580
;
}
}
.tabs
.open
.dropdown-toggle
,
.pills
.open
.dropdown-toggle
{
.tabs
.active
.dropdown-toggle
.caret
,
.pills
.active
.dropdown-toggle
.caret
{
border-top-color
:
#333
;
}
.nav
>
.dropdown.active
>
a
:hover
{
color
:
#000
;
cursor
:
pointer
;
}
.tabs
.open
.dropdown-toggle
,
.pills
.open
.dropdown-toggle
,
.nav
>
.open.active
>
a
:hover
{
color
:
#fff
;
background-color
:
#999
;
background-color
:
#999
;
border-color
:
#999
;
border-color
:
#999
;
}
}
.nav
.open
.caret
,
.nav
.open
a
:hover
.caret
{
.nav
.open
.caret
,
.nav
.open
.active
.caret
,
.nav
.open
a
:hover
.caret
{
border-top-color
:
#fff
;
border-top-color
:
#fff
;
filter
:
alpha
(
opacity
=
100
);
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
-moz-opacity
:
1
;
...
...
bootstrap.min.css
View file @
4b79443b
...
@@ -305,7 +305,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
...
@@ -305,7 +305,8 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.dropdown
:hover
.caret
,
.open.dropdown
.caret
{
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
opacity
:
1
;}
.dropdown
:hover
.caret
,
.open.dropdown
.caret
{
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
opacity
:
1
;}
.dropdown-menu
{
position
:
absolute
;
top
:
40px
;
z-index
:
1000
;
float
:
left
;
display
:
none
;
min-width
:
160px
;
max-width
:
220px
;
_width
:
160px
;
padding
:
5px
0
;
margin
:
0
;
list-style
:
none
;
background-color
:
#ffffff
;
border-color
:
#999
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
);
border-style
:
solid
;
border-width
:
1px
;
-webkit-border-radius
:
0
0
5px
5px
;
-moz-border-radius
:
0
0
5px
5px
;
border-radius
:
0
0
5px
5px
;
-webkit-box-shadow
:
0
5px
10px
rgba
(
0
,
0
,
0
,
0.2
);
-moz-box-shadow
:
0
5px
10px
rgba
(
0
,
0
,
0
,
0.2
);
box-shadow
:
0
5px
10px
rgba
(
0
,
0
,
0
,
0.2
);
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding
;
background-clip
:
padding-box
;
zoom
:
1
;}
.dropdown-menu
.divider
{
height
:
1px
;
margin
:
5px
1px
;
overflow
:
hidden
;
background-color
:
#e5e5e5
;
border-bottom
:
1px
solid
#ffffff
;}
.dropdown-menu
{
position
:
absolute
;
top
:
40px
;
z-index
:
1000
;
float
:
left
;
display
:
none
;
min-width
:
160px
;
max-width
:
220px
;
_width
:
160px
;
padding
:
5px
0
;
margin
:
0
;
list-style
:
none
;
background-color
:
#ffffff
;
border-color
:
#999
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
);
border-style
:
solid
;
border-width
:
1px
;
-webkit-border-radius
:
0
0
5px
5px
;
-moz-border-radius
:
0
0
5px
5px
;
border-radius
:
0
0
5px
5px
;
-webkit-box-shadow
:
0
5px
10px
rgba
(
0
,
0
,
0
,
0.2
);
-moz-box-shadow
:
0
5px
10px
rgba
(
0
,
0
,
0
,
0.2
);
box-shadow
:
0
5px
10px
rgba
(
0
,
0
,
0
,
0.2
);
-webkit-background-clip
:
padding-box
;
-moz-background-clip
:
padding
;
background-clip
:
padding-box
;
zoom
:
1
;}
.dropdown-menu
.divider
{
height
:
1px
;
margin
:
5px
1px
;
overflow
:
hidden
;
background-color
:
#e5e5e5
;
border-bottom
:
1px
solid
#ffffff
;}
.dropdown-menu
a
{
display
:
block
;
padding
:
2px
15px
;
clear
:
both
;
font-weight
:
normal
;
line-height
:
18px
;
color
:
#555555
;}
.dropdown-menu
a
{
display
:
block
;
padding
:
2px
15px
;
clear
:
both
;
font-weight
:
normal
;
line-height
:
18px
;
color
:
#555555
;}
.dropdown-menu
a
:hover
,
.dropdown-menu
.active
>
a
{
color
:
#fff
;
text-decoration
:
none
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
background-color
:
#0077b3
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#0088cc
),
to
(
#0077b3
));
background-image
:
-moz-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
-ms-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#0088cc
),
color-stop
(
100%
,
#0077b3
));
background-image
:
-webkit-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
-o-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#0088cc'
,
endColorstr
=
'#0077b3'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
-moz-box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);}
.dropdown-menu
li
>
a
:hover
{
color
:
#fff
;
text-decoration
:
none
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
background-color
:
#0077b3
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#0088cc
),
to
(
#0077b3
));
background-image
:
-moz-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
-ms-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#0088cc
),
color-stop
(
100%
,
#0077b3
));
background-image
:
-webkit-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
-o-linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-image
:
linear-gradient
(
top
,
#0088cc
,
#0077b3
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#0088cc'
,
endColorstr
=
'#0077b3'
,
GradientType
=
0
);
-webkit-box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
-moz-box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);
box-shadow
:
inset
0
1px
0
rgba
(
0
,
0
,
0
,
0.075
),
inset
0
-1px
rgba
(
0
,
0
,
0
,
0.075
);}
.dropdown-menu
.active
>
a
,
.dropdown-menu
.active
>
a
:hover
{
color
:
#fff
;
background-color
:
#999
;
background-image
:
none
;}
.dropdown.open
.dropdown-toggle
{
color
:
#ffffff
;
background
:
#ccc
;
background
:
rgba
(
0
,
0
,
0
,
0.3
);}
.dropdown.open
.dropdown-toggle
{
color
:
#ffffff
;
background
:
#ccc
;
background
:
rgba
(
0
,
0
,
0
,
0.3
);}
.dropdown.open
.dropdown-menu
{
display
:
block
;}
.dropdown.open
.dropdown-menu
{
display
:
block
;}
.typeahead
{
margin-top
:
2px
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
.typeahead
{
margin-top
:
2px
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
...
@@ -356,7 +357,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
...
@@ -356,7 +357,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.tabs
{
border-bottom
:
1px
solid
#ddd
;}
.tabs
{
border-bottom
:
1px
solid
#ddd
;}
.tabs
>
li
{
margin-bottom
:
-1px
;}
.tabs
>
li
{
margin-bottom
:
-1px
;}
.tabs
>
li
>
a
{
padding-top
:
9px
;
padding-bottom
:
9px
;
border
:
1px
solid
transparent
;
-webkit-border-radius
:
4px
4px
0
0
;
-moz-border-radius
:
4px
4px
0
0
;
border-radius
:
4px
4px
0
0
;}
.tabs
>
li
>
a
:hover
{
border-color
:
#eee
#eee
#ddd
;}
.tabs
>
li
>
a
{
padding-top
:
9px
;
padding-bottom
:
9px
;
border
:
1px
solid
transparent
;
-webkit-border-radius
:
4px
4px
0
0
;
-moz-border-radius
:
4px
4px
0
0
;
border-radius
:
4px
4px
0
0
;}
.tabs
>
li
>
a
:hover
{
border-color
:
#eee
#eee
#ddd
;}
.tabs
.active
>
a
,
.tabs
.active
>
a
:hover
{
color
:
#555555
;
background-color
:
#ffffff
;
border
:
1px
solid
#ddd
;
border-bottom-color
:
transparent
;
cursor
:
default
;}
.tabs
>
.active
>
a
,
.tabs
>
.active
>
a
:hover
{
color
:
#555555
;
background-color
:
#ffffff
;
border
:
1px
solid
#ddd
;
border-bottom-color
:
transparent
;
cursor
:
default
;}
.pills
>
li
>
a
{
padding-top
:
8px
;
padding-bottom
:
8px
;
margin-top
:
2px
;
margin-bottom
:
2px
;
-webkit-border-radius
:
5px
;
-moz-border-radius
:
5px
;
border-radius
:
5px
;}
.pills
>
li
>
a
{
padding-top
:
8px
;
padding-bottom
:
8px
;
margin-top
:
2px
;
margin-bottom
:
2px
;
-webkit-border-radius
:
5px
;
-moz-border-radius
:
5px
;
border-radius
:
5px
;}
.pills
.active
>
a
,
.pills
.active
>
a
:hover
{
color
:
#ffffff
;
background-color
:
#0088cc
;}
.pills
.active
>
a
,
.pills
.active
>
a
:hover
{
color
:
#ffffff
;
background-color
:
#0088cc
;}
.nav.stacked
>
li
{
float
:
none
;}
.nav.stacked
>
li
{
float
:
none
;}
...
@@ -372,8 +373,10 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
...
@@ -372,8 +373,10 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.pills
.dropdown-menu
{
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
.pills
.dropdown-menu
{
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
.tabs
.dropdown-toggle
.caret
,
.pills
.dropdown-toggle
.caret
{
border-top-color
:
#0088cc
;
margin-top
:
6px
;}
.tabs
.dropdown-toggle
.caret
,
.pills
.dropdown-toggle
.caret
{
border-top-color
:
#0088cc
;
margin-top
:
6px
;}
.tabs
.dropdown-toggle
:hover
.caret
,
.pills
.dropdown-toggle
:hover
.caret
{
border-top-color
:
#005580
;}
.tabs
.dropdown-toggle
:hover
.caret
,
.pills
.dropdown-toggle
:hover
.caret
{
border-top-color
:
#005580
;}
.tabs
.open
.dropdown-toggle
,
.pills
.open
.dropdown-toggle
{
background-color
:
#999
;
border-color
:
#999
;}
.tabs
.active
.dropdown-toggle
.caret
,
.pills
.active
.dropdown-toggle
.caret
{
border-top-color
:
#333
;}
.nav
.open
.caret
,
.nav
.open
a
:hover
.caret
{
border-top-color
:
#fff
;
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
opacity
:
1
;}
.nav
>
.dropdown.active
>
a
:hover
{
color
:
#000
;
cursor
:
pointer
;}
.tabs
.open
.dropdown-toggle
,
.pills
.open
.dropdown-toggle
,
.nav
>
.open.active
>
a
:hover
{
color
:
#fff
;
background-color
:
#999
;
border-color
:
#999
;}
.nav
.open
.caret
,
.nav
.open.active
.caret
,
.nav
.open
a
:hover
.caret
{
border-top-color
:
#fff
;
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
opacity
:
1
;}
.tabs.stacked
.open
>
a
:hover
{
border-color
:
#999
;}
.tabs.stacked
.open
>
a
:hover
{
border-color
:
#999
;}
.tabbable
{
zoom
:
1
;}
.tabbable
:before
,
.tabbable
:after
{
display
:
table
;
*
display
:
inline
;
content
:
""
;
zoom
:
1
;}
.tabbable
{
zoom
:
1
;}
.tabbable
:before
,
.tabbable
:after
{
display
:
table
;
*
display
:
inline
;
content
:
""
;
zoom
:
1
;}
.tabbable
:after
{
clear
:
both
;}
.tabbable
:after
{
clear
:
both
;}
...
...
lib/dropdowns.less
View file @
4b79443b
...
@@ -71,9 +71,8 @@
...
@@ -71,9 +71,8 @@
}
}
}
}
// Hover & Active states
// Hover state
.dropdown-menu a:hover,
.dropdown-menu li > a:hover {
.dropdown-menu .active > a {
color: #fff;
color: #fff;
text-decoration: none;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
...
@@ -82,6 +81,14 @@
...
@@ -82,6 +81,14 @@
.box-shadow(@shadow);
.box-shadow(@shadow);
}
}
// Active state
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
color: #fff;
background-color: #999;
background-image: none; // remove the gradient
}
// Open state for the dropdown
// Open state for the dropdown
.dropdown.open {
.dropdown.open {
.dropdown-toggle {
.dropdown-toggle {
...
...
lib/navs.less
View file @
4b79443b
...
@@ -101,8 +101,8 @@
...
@@ -101,8 +101,8 @@
}
}
}
}
// Active state, and it's :hover to override normal :hover
// Active state, and it's :hover to override normal :hover
.tabs .active > a,
.tabs
>
.active > a,
.tabs .active > a:hover {
.tabs
>
.active > a:hover {
color: @gray;
color: @gray;
background-color: @white;
background-color: @white;
border: 1px solid #ddd;
border: 1px solid #ddd;
...
@@ -183,6 +183,10 @@
...
@@ -183,6 +183,10 @@
.pills .dropdown-menu {
.pills .dropdown-menu {
.border-radius(4px);
.border-radius(4px);
}
}
// Default dropdown links
// -------------------------
// Make carets use linkColor to start
.tabs .dropdown-toggle .caret,
.tabs .dropdown-toggle .caret,
.pills .dropdown-toggle .caret {
.pills .dropdown-toggle .caret {
border-top-color: @linkColor;
border-top-color: @linkColor;
...
@@ -192,12 +196,32 @@
...
@@ -192,12 +196,32 @@
.pills .dropdown-toggle:hover .caret {
.pills .dropdown-toggle:hover .caret {
border-top-color: @linkColorHover;
border-top-color: @linkColorHover;
}
}
// Active dropdown links
// -------------------------
.tabs .active .dropdown-toggle .caret,
.pills .active .dropdown-toggle .caret {
border-top-color: #333;
}
// Active:hover dropdown links
// -------------------------
.nav > .dropdown.active > a:hover {
color: #000;
cursor: pointer;
}
// Open dropdowns
// -------------------------
.tabs .open .dropdown-toggle,
.tabs .open .dropdown-toggle,
.pills .open .dropdown-toggle {
.pills .open .dropdown-toggle,
.nav > .open.active > a:hover {
color: #fff;
background-color: #999;
background-color: #999;
border-color: #999;
border-color: #999;
}
}
.nav .open .caret,
.nav .open .caret,
.nav .open.active .caret,
.nav .open a:hover .caret {
.nav .open a:hover .caret {
border-top-color: #fff;
border-top-color: #fff;
.opacity(100);
.opacity(100);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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