From: Mark Otto Date: Sat, 4 May 2013 20:11:20 +0000 (-0700) Subject: Fixes #7783: nuke bottom margin on fixed-bottom-navbar X-Git-Tag: v3.0.0-rc1~369 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcf7cc084d6b2d0522860c4c9be6e914c67ab91a;p=thirdparty%2Fbootstrap.git Fixes #7783: nuke bottom margin on fixed-bottom-navbar --- diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e1260c7d59..eba96cb300 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 bf9c3646a0..d4e5286a5a 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) {