give IE7 inline-block behavior for input-prepend/append

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e6ef1c0650f893c22aca5e6a433f00fbf50b8e32..21cc0149957580da33ed945a66eb3d70d201f824 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 758b266c16f2c523971514c6036ee81e239b1713..ff24af1fa354582656e88f34650c197b6f7ab3a2 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1116,6 +1116,10 @@ select:focus:required:invalid:focus {
 .form-inline .input-append,
 .form-horizontal .input-append {
   display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
   margin-bottom: 0;
 }
 .form-search .hide,

diff --git a/less/forms.less b/less/forms.less
index 4f99cce8dbecb52f7db0d2f9debfd932146b35a7..72903faa29cd472f878a35c58ec81cfcdd5edd44 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -475,6 +475,7 @@ select:focus:required:invalid {
   .input-prepend,
   .input-append {
     display: inline-block;
+    .ie7-inline-block();
     margin-bottom: 0;
   }
   // Re-hide hidden elements due to specifity