diff options
| author | Mark Otto <[email protected]> | 2012-03-25 14:37:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-25 14:37:19 -0700 |
| commit | cbd77d0aeba4b4105dfcc51dc1298a0d00452869 (patch) | |
| tree | 10a53cda3f2ea373dc86480a938c6bd0528ae245 | |
| parent | d0526e31fa291bd1ef943081ff7248e734edccb7 (diff) | |
| download | bootstrap-cbd77d0aeba4b4105dfcc51dc1298a0d00452869.tar.xz bootstrap-cbd77d0aeba4b4105dfcc51dc1298a0d00452869.zip | |
give IE7 inline-block behavior for input-prepend/append
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56818 -> 56831 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/forms.less | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex e6ef1c065..21cc01499 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip 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, diff --git a/less/forms.less b/less/forms.less index 4f99cce8d..72903faa2 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 |