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
b81a082c
Commit
b81a082c
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
add navbarheight support to .brand and .nav links in navbar
parent
6c5c29ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
+2
-1
docs/assets/css/bootstrap.css
less/navbar.less
+8
-2
less/navbar.less
with
10 additions
and
3 deletions
+10
-3
docs/assets/bootstrap.zip
+
0
-
0
View file @
b81a082c
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
2
-
1
View file @
b81a082c
...
...
@@ -2804,6 +2804,7 @@ input[type="submit"].btn.btn-mini {
margin-bottom
:
18px
;
}
.navbar-inner
{
height
:
40px
;
padding-left
:
20px
;
padding-right
:
20px
;
background-color
:
#2c2c2c
;
...
...
@@ -3030,7 +3031,7 @@ input[type="submit"].btn.btn-mini {
}
.navbar
.nav
>
li
>
a
{
float
:
none
;
padding
:
10
px
10px
11px
;
padding
:
9
px
10px
11px
;
line-height
:
19px
;
color
:
#999999
;
text-decoration
:
none
;
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
8
-
2
View file @
b81a082c
...
...
@@ -16,6 +16,7 @@
// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
height: @navbarHeight;
padding-left: 20px;
padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
...
...
@@ -69,7 +70,10 @@
.brand {
float: left;
display: block;
padding: 8px 20px 12px;
// Vertically center the text given @navbarHeight
@elementHeight: 20px;
padding: ((@navbarHeight - @elementHeight) / 2 - 2) 20px ((@navbarHeight - @elementHeight) / 2 + 2);
margin-left: -20px; // negative indent to left-align the text down the page
font-size: 20px;
font-weight: 200;
...
...
@@ -225,7 +229,9 @@
// Links
.navbar .nav > li > a {
float: none;
padding: 10px 10px 11px;
// Vertically center the text given @navbarHeight
@elementHeight: 20px;
padding: ((@navbarHeight - @elementHeight) / 2 - 1) 10px ((@navbarHeight - @elementHeight) / 2 + 1);
line-height: 19px;
color: @navbarLinkColor;
text-decoration: none;
...
...
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