fix #2718, misaligned uneditable inputs in prepends/appends

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 82d184fdcbc91113895f297e108e8f73c72e165b..fac56f1bb1f440817a2be59d9b28c3d3ec6d23e9 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 825c764f3c799d2d810e3cb7d58ca151b62e76fd..393d9e60660b6435e54b850442dc3972bdf4593f 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -951,7 +951,6 @@ select:focus:required:invalid:focus {
   clear: both;
 }
 .uneditable-input {
-  display: block;
   background-color: #ffffff;
   border-color: #eee;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
@@ -994,6 +993,7 @@ select:focus:required:invalid:focus {
 .input-append .uneditable-input {
   margin-bottom: 0;
   *margin-left: 0;
+  vertical-align: middle;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;

diff --git a/less/forms.less b/less/forms.less
index a53b273b906296f9cc0a1604192961df21c152d5..ffd1983725274ba95ebf70556815d8632651dfc3 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -321,7 +321,6 @@ select:focus:required:invalid {
 
 // For text that needs to appear as an input but should not be an input
 .uneditable-input {
-  display: block;
   background-color: @inputBackground;
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
@@ -367,6 +366,7 @@ select:focus:required:invalid {
   .uneditable-input {
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
+    vertical-align: middle;
     .border-radius(0 3px 3px 0);
     &:focus {
       position: relative;