diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5c410ec..0ab3410 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,11 @@ X-editable changelog ============================= +Version 1.3.1 wip +---------------------------- +[bug] inline container moves on next line in IE7 (vitalets) + + Version 1.3.0 Dec 10, 2012 ---------------------------- [enh] added html5 inputs support: password, email, url, tel, number, range (vitalets) diff --git a/src/containers/editable-container.css b/src/containers/editable-container.css index a6d93c8..472b62e 100644 --- a/src/containers/editable-container.css +++ b/src/containers/editable-container.css @@ -8,9 +8,11 @@ } .editable-container.editable-inline { -/* display: inline; */ /* display: inline does not correctly work with show()/hide() in jquery <= 1.7.2 */ display: inline-block; vertical-align: middle; + /* inline-block emulation for IE7*/ + zoom: 1; + *display: inline; } .editable-container.ui-widget { diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css index ef53d36..f8d82ed 100644 --- a/src/editable-form/editable-form.css +++ b/src/editable-form/editable-form.css @@ -11,7 +11,7 @@ display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */ vertical-align: top; margin-left: 7px; - /* display-inline emulation for IE7*/ + /* inline-block emulation for IE7*/ zoom: 1; *display: inline; }