aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-25 14:37:19 -0700
committerMark Otto <[email protected]>2012-03-25 14:37:19 -0700
commitcbd77d0aeba4b4105dfcc51dc1298a0d00452869 (patch)
tree10a53cda3f2ea373dc86480a938c6bd0528ae245 /docs
parentd0526e31fa291bd1ef943081ff7248e734edccb7 (diff)
downloadbootstrap-cbd77d0aeba4b4105dfcc51dc1298a0d00452869.tar.xz
bootstrap-cbd77d0aeba4b4105dfcc51dc1298a0d00452869.zip
give IE7 inline-block behavior for input-prepend/append
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin56818 -> 56831 bytes
-rw-r--r--docs/assets/css/bootstrap.css4
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e6ef1c065..21cc01499 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 758b266c1..ff24af1fa 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,