From: Mark Otto Date: Mon, 2 Dec 2013 04:18:40 +0000 (-0800) Subject: Merge pull request #11499 from bassjobsen/patch-3 X-Git-Tag: v3.0.3~16^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=561aff7942d9adfc9508232789e2598406f80934;p=thirdparty%2Fbootstrap.git Merge pull request #11499 from bassjobsen/patch-3 fix navbar dropdown window resize bug --- 561aff7942d9adfc9508232789e2598406f80934 diff --cc less/navbar.less index eb6031a59e,130984642c..9c5eeed4ed --- a/less/navbar.less +++ b/less/navbar.less @@@ -74,16 -74,18 +74,16 @@@ } &.in { - overflow-y: auto; + overflow-y: visible; } - // Account for first and last children spacing - .navbar-nav.navbar-left:first-child { - margin-left: -@navbar-padding-horizontal; - } - .navbar-nav.navbar-right:last-child { - margin-right: -@navbar-padding-horizontal; - } - .navbar-text:last-child { - margin-right: 0; + // Undo the collapse side padding for navbars with containers to ensure + // alignment of right-aligned contents. + .navbar-fixed-top &, + .navbar-static-top &, + .navbar-fixed-bottom & { + padding-left: 0; + padding-right: 0; } } }