1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

add navbarheight support to .brand and .nav links in navbar

This commit is contained in:
Mark Otto 2012-03-25 12:32:29 -07:00
parent 6c5c29ada2
commit b81a082cd1
3 changed files with 10 additions and 3 deletions

Binary file not shown.

View file

@ -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: 10px 10px 11px;
padding: 9px 10px 11px;
line-height: 19px;
color: #999999;
text-decoration: none;

View file

@ -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;