From: Mark Otto <otto@github.com>
Date: Sat, 12 Jan 2013 04:42:44 +0000 (-0800)
Subject: Fixes #6473: Make .input-prepend and .input-append inline-block to match other form... 
X-Git-Tag: v2.3.0^2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56a24027c374fd9c75c150d99332fe12b0299b35;p=thirdparty%2Fbootstrap.git

Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states
---

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