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

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 478586a1445153d0ebb61a3fc71d7ac0362eda37..aca0e7a187db510f7194288deefcb239c5193e8f 100644 (file)
--- 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 47d221bcfd2671dabe675ca528a920b99e452392..c1b381380b0eb8c00b2431bb46c68185d4726dd1 100644 (file)
--- 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