simplify code for input-prepend/append in inline and search forms

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6b84f22d02cdc67d4fecbea0aca9ff28142b7a9c..33fb717b6825246fdc88ace68e48b3156f6b057f 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 255b956c14ea7f7f807f31e83f833e0d73af92bd..64c024c9b87fa7b05afeb83974f5c286324b41d4 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -982,6 +982,7 @@ select:focus:required:invalid:focus {
 }
 .input-prepend,
 .input-append {
+  display: inline-block;
   margin-bottom: 5px;
 }
 .input-prepend input,
@@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus {
 .form-inline .input-prepend {
   display: inline-block;
 }
-.form-search .input-append .add-on,
-.form-search .input-prepend .add-on,
-.form-inline .input-append .add-on,
-.form-inline .input-prepend .add-on {
-  vertical-align: middle;
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
 }
 .form-search .radio,
 .form-search .checkbox,

diff --git a/less/forms.less b/less/forms.less
index 614d07ad744bae1305e7470e8c95196c833c6c2e..5fc8f52619edb8c4529898486bdf1c21120c2a5e 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -361,6 +361,7 @@ select:focus:required:invalid {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
+  display: inline-block;
   margin-bottom: 5px;
   input,
   select,
@@ -456,12 +457,12 @@ select:focus:required:invalid {
 .form-inline .input-prepend {
   display: inline-block;
 }
-// Make the prepend and append add-on vertical-align: middle;
-.form-search .input-append .add-on,
-.form-search .input-prepend .add-on,
-.form-inline .input-append .add-on,
-.form-inline .input-prepend .add-on {
-  vertical-align: middle;
+// Remove margin for input-prepend/-append
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
 }
 // Inline checkbox/radio labels (remove padding on left)
 .form-search .radio,