From 3e00c1261fa3d48b184874c9f5b94ce370bd6449 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 12 Feb 2012 20:28:22 -0800
Subject: allow .input-prepend/.input-append to work in .navbar per #1681

---
 less/navbar.less | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'less')

diff --git a/less/navbar.less b/less/navbar.less
index 35c209fc4..16553c1ff 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -81,7 +81,7 @@
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0;
+    margin-top: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
@@ -104,6 +104,14 @@
   input[type="radio"] {
     margin-top: 3px;
   }
+  .input-append,
+  .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0; // remove the margin on top since it's on the parent
+    }
+  }
 }
 
 // Navbar search
-- 
cgit v1.2.3