From: Mark Otto <markotto@twitter.com>
Date: Sun, 25 Mar 2012 21:37:19 +0000 (-0700)
Subject: give IE7 inline-block behavior for input-prepend/append
X-Git-Tag: v2.0.3~5^2~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbd77d0aeba4b4105dfcc51dc1298a0d00452869;p=thirdparty%2Fbootstrap.git

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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e6ef1c0650..21cc014995 100644
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 758b266c16..ff24af1fa3 100644
--- 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 4f99cce8db..72903faa29 100644
--- 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