aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-30 12:15:08 -0700
committerMark Otto <[email protected]>2012-07-30 12:15:08 -0700
commit7fa99fb1fe9392f61cb5c46f7e5082e73e8b8784 (patch)
tree2fea436603a9dd0c2b1ab82f50d95e271d89346b /less
parent6bf661aceb934db79b148757aed5cd13ce174658 (diff)
downloadbootstrap-7fa99fb1fe9392f61cb5c46f7e5082e73e8b8784.tar.xz
bootstrap-7fa99fb1fe9392f61cb5c46f7e5082e73e8b8784.zip
fix navbar form alignment, and update examples to show these cases
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less5
-rw-r--r--less/tests/css-tests.html7
2 files changed, 8 insertions, 4 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 02535a467..0e027d2c3 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -48,7 +48,8 @@
display: block;
// Vertically center the text given @navbarHeight
@elementHeight: 20px;
- padding: ((@navbarHeight - @elementHeight) / 2) 20px ((@navbarHeight - @elementHeight) / 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
font-size: 20px;
font-weight: 200;
@@ -93,7 +94,7 @@
select,
.radio,
.checkbox {
- .navbarVerticalAlign(28px); // Vertically center in navbar
+ .navbarVerticalAlign(30px); // Vertically center in navbar
}
input,
select,
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 81d5b1896..a8f62c3cc 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -34,7 +34,7 @@
<!-- Navbar
================================================== -->
- <div class="navbar navbar-fixed-top">
+ <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="../../docs/index.html">Bootstrap</a>
@@ -53,7 +53,9 @@
</header>
-<div class="container">
+<div class="bs-docs-canvas">
+
+ <div class="container">
@@ -1096,6 +1098,7 @@
</div>
</footer>
+</div>
<!-- Le javascript