mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar
This commit is contained in:
commit
61a8ef2feb
1 changed files with 2 additions and 5 deletions
|
@ -47,9 +47,7 @@
|
||||||
float: left;
|
float: left;
|
||||||
display: block;
|
display: block;
|
||||||
// Vertically center the text given @navbarHeight
|
// Vertically center the text given @navbarHeight
|
||||||
@elementHeight: 20px;
|
padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2);
|
||||||
@heightDifference: @navbarHeight - @elementHeight;
|
|
||||||
padding: ((@heightDifference / 2) - 2) 20px ((@heightDifference / 2) + 2);
|
|
||||||
margin-left: -20px; // negative indent to left-align the text down the page
|
margin-left: -20px; // negative indent to left-align the text down the page
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
|
@ -209,8 +207,7 @@
|
||||||
.navbar .nav > li > a {
|
.navbar .nav > li > a {
|
||||||
float: none;
|
float: none;
|
||||||
// Vertically center the text given @navbarHeight
|
// Vertically center the text given @navbarHeight
|
||||||
@elementHeight: 20px;
|
padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
|
||||||
padding: ((@navbarHeight - @elementHeight) / 2) 15px ((@navbarHeight - @elementHeight) / 2);
|
|
||||||
color: @navbarLinkColor;
|
color: @navbarLinkColor;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
text-shadow: 0 1px 0 @navbarBackgroundHighlight;
|
text-shadow: 0 1px 0 @navbarBackgroundHighlight;
|
||||||
|
|
Loading…
Add table
Reference in a new issue