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
98ebd548
Commit
98ebd548
authored
Jun 28, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
address issues with fixed subnav like borders, corners, etc
parent
6f4360c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
18 deletions
+26
-18
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+13
-9
less/navbar.less
less/navbar.less
+13
-9
No files found.
docs/assets/css/bootstrap.css
View file @
98ebd548
...
...
@@ -3987,7 +3987,7 @@ input[type="submit"].btn.btn-mini {
.navbar
.nav
>
li
>
a
{
float
:
none
;
padding
:
9
px
12px
11px
;
padding
:
10
px
12px
11px
;
line-height
:
19px
;
color
:
#999999
;
text-decoration
:
none
;
...
...
@@ -4174,12 +4174,7 @@ input[type="submit"].btn.btn-mini {
/* Subnav navbar
-------------------------------------------------- */
.navbar-subnav
{
height
:
36px
;
}
.navbar-subnav
.navbar-inner
{
min-height
:
36px
;
padding
:
0
;
background-color
:
#f6f6f6
;
background-image
:
-moz-linear-gradient
(
top
,
#f9f9f9
,
#f1f1f1
);
...
...
@@ -4204,6 +4199,12 @@ input[type="submit"].btn.btn-mini {
color
:
#005580
;
}
.navbar-subnav
.nav
>
.active
>
a
,
.navbar-subnav
.nav
>
.active
>
a
:hover
{
color
:
#777
;
background-color
:
#e5e5e5
;
}
.navbar-subnav
.nav
li
.dropdown
.dropdown-toggle
.caret
,
.navbar-subnav
.nav
li
.dropdown.open
.caret
{
border-top-color
:
#0088cc
;
...
...
@@ -4220,15 +4221,18 @@ input[type="submit"].btn.btn-mini {
right
:
0
;
left
:
0
;
z-index
:
1020
;
-webkit-box-shadow
:
inset
0
1px
0
#ffffff
,
0
1px
10px
rgba
(
0
,
0
,
0
,
0.1
);
-moz-box-shadow
:
inset
0
1px
0
#ffffff
,
0
1px
10px
rgba
(
0
,
0
,
0
,
0.1
);
box-shadow
:
inset
0
1px
0
#ffffff
,
0
1px
10px
rgba
(
0
,
0
,
0
,
0.1
);
}
.navbar-subnav-fixed
.navbar-inner
{
border-color
:
#d5d5d5
;
border-width
:
0
0
1px
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
filter
:
progid
:
dximagetransform
.
microsoft
.
gradient
(
enabled
=
false
);
-webkit-box-shadow
:
inset
0
1px
0
#ffffff
,
0
1px
10px
rgba
(
0
,
0
,
0
,
0.1
);
-moz-box-shadow
:
inset
0
1px
0
#ffffff
,
0
1px
10px
rgba
(
0
,
0
,
0
,
0.1
);
box-shadow
:
inset
0
1px
0
#ffffff
,
0
1px
10px
rgba
(
0
,
0
,
0
,
0.1
);
}
.navbar-subnav-fixed
.nav
{
...
...
less/navbar.less
View file @
98ebd548
...
...
@@ -205,7 +205,7 @@
float: none;
// Vertically center the text given @navbarHeight
@elementHeight: 20px;
padding: ((@navbarHeight - @elementHeight) / 2
- 1
) 12px ((@navbarHeight - @elementHeight) / 2 + 1);
padding: ((@navbarHeight - @elementHeight) / 2) 12px ((@navbarHeight - @elementHeight) / 2 + 1);
line-height: 19px;
color: @navbarLinkColor;
text-decoration: none;
...
...
@@ -379,10 +379,8 @@
// Override the default .navbar
.navbar-subnav {
height: 36px;
}
.navbar-subnav .navbar-inner {
min-height: 36px;
padding: 0;
#gradient > .vertical(#f9f9f9, #f1f1f1);
.box-shadow(none);
...
...
@@ -398,6 +396,13 @@
color: @linkColorHover;
}
// Active nav links
.navbar-subnav .nav > .active > a,
.navbar-subnav .nav > .active > a:hover {
color: #777;
background-color: #e5e5e5;
}
// Dropdown carets
.navbar-subnav .nav li.dropdown .dropdown-toggle .caret,
.navbar-subnav .nav li.dropdown.open .caret {
...
...
@@ -410,7 +415,6 @@
color: @linkColorHover;
}
// Fixed subnav on scroll, but only for 980px and up (sorry IE!)
.navbar-subnav-fixed {
position: fixed;
...
...
@@ -418,15 +422,15 @@
left: 0;
right: 0;
z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 10px rgba(0,0,0,.1);
-moz-box-shadow: inset 0 1px 0 #fff, 0 1px 10px rgba(0,0,0,.1);
box-shadow: inset 0 1px 0 #fff, 0 1px 10px rgba(0,0,0,.1);
}
.navbar-subnav-fixed .navbar-inner {
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
.border-radius(0);
}
.navbar-subnav-fixed .nav {
float: none;
...
...
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