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
cf05dc86
Commit
cf05dc86
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
adjust navs for fine details on dropdowns in stacked nav and improved open state there
parent
916761d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bootstrap.css
+12
-5
bootstrap.css
bootstrap.min.css
+6
-4
bootstrap.min.css
lib/navs.less
+14
-8
lib/navs.less
with
32 additions
and
17 deletions
+32
-17
bootstrap.css
+
12
-
5
View file @
cf05dc86
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 8 0
1:56:47
PST 2012
* Date: Sun Jan 8 0
2:15:22
PST 2012
*/
html
,
body
{
margin
:
0
;
...
...
@@ -1925,7 +1925,7 @@ i {
.pills.stacked
>
li
:last-child
>
a
{
margin-bottom
:
1px
;
}
.
tabs
.dropdown-menu
,
.pills
.dropdown-menu
{
.
nav
.dropdown-menu
{
top
:
33px
;
border-width
:
1px
;
}
...
...
@@ -1934,19 +1934,26 @@ i {
-moz-border-radius
:
4px
;
border-radius
:
4px
;
}
.tabs
.dropdown-toggle
.caret
,
.pills
.dropdown-toggle
.caret
{
.nav
.dropdown-toggle
.caret
{
border-top-color
:
#0088cc
;
margin-top
:
6px
;
}
.tabs
.open
.dropdown-toggle
,
.pills
.open
.dropdown-toggle
{
.nav
.dropdown-toggle
:hover
.caret
{
border-top-color
:
#005580
;
}
.nav
.open
.dropdown-toggle
{
background-color
:
#999
;
border-color
:
#999
;
}
.
tabs
.open
.caret
,
.
pills
.open
.caret
{
.
nav
.open
.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
;
}
.tabbable
{
zoom
:
1
;
}
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
6
-
4
View file @
cf05dc86
...
...
@@ -368,11 +368,13 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.tabs.stacked
>
li
>
a
:hover
{
border-color
:
#ddd
;
z-index
:
2
;}
.pills.stacked
>
li
>
a
{
margin-bottom
:
3px
;}
.pills.stacked
>
li
:last-child
>
a
{
margin-bottom
:
1px
;}
.
tabs
.dropdown-menu
,
.pills
.dropdown-menu
{
top
:
33px
;
border-width
:
1px
;}
.
nav
.dropdown-menu
{
top
:
33px
;
border-width
:
1px
;}
.pills
.dropdown-menu
{
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
.tabs
.dropdown-toggle
.caret
,
.pills
.dropdown-toggle
.caret
{
margin-top
:
6px
;}
.tabs
.open
.dropdown-toggle
,
.pills
.open
.dropdown-toggle
{
background-color
:
#999
;
border-color
:
#999
;}
.tabs
.open
.caret
,
.pills
.open
.caret
{
border-top-color
:
#fff
;
filter
:
alpha
(
opacity
=
100
);
-moz-opacity
:
1
;
opacity
:
1
;}
.nav
.dropdown-toggle
.caret
{
border-top-color
:
#0088cc
;
margin-top
:
6px
;}
.nav
.dropdown-toggle
:hover
.caret
{
border-top-color
:
#005580
;}
.nav
.open
.dropdown-toggle
{
background-color
:
#999
;
border-color
:
#999
;}
.nav
.open
.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
;}
.tabbable
{
zoom
:
1
;}
.tabbable
:before
,
.tabbable
:after
{
display
:
table
;
*
display
:
inline
;
content
:
""
;
zoom
:
1
;}
.tabbable
:after
{
clear
:
both
;}
.tabs-below
.tabs
,
.tabs-right
.tabs
,
.tabs-left
.tabs
{
border-bottom
:
0
;}
...
...
This diff is collapsed.
Click to expand it.
lib/navs.less
+
14
-
8
View file @
cf05dc86
...
...
@@ -175,29 +175,35 @@
// ---------
// Position the menu
.tabs .dropdown-menu,
.pills .dropdown-menu {
.nav .dropdown-menu {
top: 33px;
border-width: 1px;
}
.pills .dropdown-menu {
.border-radius(4px);
}
.
tabs
.dropdown-toggle .caret
,
.pills .dropdown-toggle .caret {
.
nav
.dropdown-toggle .caret
{
border-top-color: @linkColor;
margin-top: 6px;
}
.tabs .open .dropdown-toggle,
.pills .open .dropdown-toggle {
.nav .dropdown-toggle:hover .caret {
border-top-color: @linkColorHover;
}
.nav .open .dropdown-toggle {
background-color: #999;
border-color: #999;
}
.
tabs
.open .caret,
.
pills
.open .caret {
.
nav
.open .caret,
.
nav
.open
a:hover
.caret {
border-top-color: #fff;
.opacity(100);
}
// Dropdowns in stacked tabs
.tabs.stacked .open > a:hover {
border-color: #999;
}
// TABBABLE
...
...
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