fixes #4680: proper margin on buttons in navbar forms

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 09d85da0e96b6ef1128018f5c99e3d6598aa3245..d19d6a44267cb6539c64f4e7c5f50e61b21d73a4 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4178,7 +4178,9 @@ input[type="submit"].btn.btn-mini {
   margin-top: 5px;
 }
 
-.navbar .btn-group .btn {
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn {
   margin-top: 0;
 }
 

diff --git a/less/navbar.less b/less/navbar.less
index a1fe00f5137b465a9385df3b949fa1e42ed08a3b..64e2eb7ea3f46a8d84585d25c32b931a075da43f 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -92,7 +92,9 @@
 .navbar .btn-group {
   .navbarVerticalAlign(30px); // Vertically center in navbar
 }
-.navbar .btn-group .btn {
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn {
   margin-top: 0; // then undo the margin here so we don't accidentally double it
 }