diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-04 20:59:33 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-04 20:59:33 -0700 |
| commit | 2be122cb5032567e88bb926b8aac250fd488cf68 (patch) | |
| tree | d8900899a18f29d39c39380bec119823f38f34e5 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm | |
| parent | 34a7e57ef205362d6c093fa7234ca38977560bea (diff) | |
| download | elgg-2be122cb5032567e88bb926b8aac250fd488cf68.tar.gz elgg-2be122cb5032567e88bb926b8aac250fd488cf68.tar.bz2 | |
Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm')
| -rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm index b5a3d15d9..76ab68d89 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm @@ -316,6 +316,8 @@ <td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td> </tr> </table> + </fieldset> + <div style="float: left; width: 49%"> <fieldset> <legend>{#style_dlg.padding}</legend> @@ -672,6 +674,7 @@ <td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td> </tr> </table> +</fieldset> <div style="float: left; width: 49%"> <fieldset> @@ -820,7 +823,6 @@ </div> <br style="clear: both" /> </div> -</fieldset> </div> <div class="mceActionPanel"> |