aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-04 13:11:20 -0700
committerMark Otto <[email protected]>2013-05-04 13:11:20 -0700
commitdcf7cc084d6b2d0522860c4c9be6e914c67ab91a (patch)
tree8224fc17f3ede4707bef78ddfb6c7d708e6764e2
parent7d41a387693c49347e06572ceb7ec2207ee30d46 (diff)
downloadbootstrap-dcf7cc084d6b2d0522860c4c9be6e914c67ab91a.tar.xz
bootstrap-dcf7cc084d6b2d0522860c4c9be6e914c67ab91a.zip
Fixes #7783: nuke bottom margin on fixed-bottom-navbar
-rw-r--r--docs/assets/css/bootstrap.css1
-rw-r--r--less/navbar.less11
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e1260c7d5..eba96cb30 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3578,6 +3578,7 @@ button.close {
.navbar-fixed-bottom {
bottom: 0;
+ margin-bottom: 0;
}
.navbar-brand {
diff --git a/less/navbar.less b/less/navbar.less
index bf9c3646a..d4e5286a5 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -67,8 +67,13 @@
z-index: @zindex-navbar-fixed;
border-radius: 0;
}
-.navbar-fixed-top { top: 0; }
-.navbar-fixed-bottom { bottom: 0; }
+.navbar-fixed-top {
+ top: 0;
+}
+.navbar-fixed-bottom {
+ bottom: 0;
+ margin-bottom: 0; // override .navbar defaults
+}
@@ -262,7 +267,7 @@
-// Inverse navbar
+// Responsive navbar
// --------------------------------------------------
@media screen and (min-width: @screen-tablet) {