diff options
| author | Mark Otto <[email protected]> | 2012-08-14 16:27:01 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-14 16:27:01 -0700 |
| commit | 61a8ef2febf9b9f864d81a6a07aa833c04fc14d9 (patch) | |
| tree | 635537c016a300c467ef18ced9cce348b4bc3f0a | |
| parent | 9c72246d491fa942635a27ee0047e473f4df05cc (diff) | |
| parent | 41093a328edd8b49f68bc1f817506ada11b568ef (diff) | |
| download | bootstrap-61a8ef2febf9b9f864d81a6a07aa833c04fc14d9.tar.xz bootstrap-61a8ef2febf9b9f864d81a6a07aa833c04fc14d9.zip | |
Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar
| -rw-r--r-- | less/navbar.less | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/less/navbar.less b/less/navbar.less index bf94ed688..fc8f782db 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -47,9 +47,7 @@ float: left; display: block; // Vertically center the text given @navbarHeight - @elementHeight: 20px; - @heightDifference: @navbarHeight - @elementHeight; - padding: ((@heightDifference / 2) - 2) 20px ((@heightDifference / 2) + 2); + padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2); margin-left: -20px; // negative indent to left-align the text down the page font-size: 20px; font-weight: 200; @@ -209,8 +207,7 @@ .navbar .nav > li > a { float: none; // Vertically center the text given @navbarHeight - @elementHeight: 20px; - padding: ((@navbarHeight - @elementHeight) / 2) 15px ((@navbarHeight - @elementHeight) / 2); + padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2); color: @navbarLinkColor; text-decoration: none; text-shadow: 0 1px 0 @navbarBackgroundHighlight; |