From 56a24027c374fd9c75c150d99332fe12b0299b35 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 11 Jan 2013 20:42:44 -0800
Subject: [PATCH] Fixes #6473: Make .input-prepend and .input-append
 inline-block to match other form states

---
 docs/assets/css/bootstrap.css | 1 +
 less/forms.less               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 478586a144..aca0e7a187 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1646,6 +1646,7 @@ select:focus:invalid:focus {
 
 .input-append,
 .input-prepend {
+  display: inline-block;
   margin-bottom: 5px;
   font-size: 0;
   white-space: nowrap;
diff --git a/less/forms.less b/less/forms.less
index 47d221bcfd..c1b381380b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -422,6 +422,7 @@ select:focus:invalid {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-append,
 .input-prepend {
+  display: inline-block;
   margin-bottom: 5px;
   font-size: 0; // white space collapse hack
   white-space: nowrap; // Prevent span and input from separating