diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-01 11:48:29 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-01 11:48:29 +0200 |
| commit | 89d6ce68463b92641946551b07ec49b023d56d90 (patch) | |
| tree | 07aeda01ba9573d8fc1900578b2db24040f7bdaa /skins | |
| parent | 4a1cd8543a089b505495068fbbe53bda4dc3c09c (diff) | |
Update to TinyMCE 4.x
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/common.css | 4 | ||||
| -rw-r--r-- | skins/classic/functions.js | 7 | ||||
| -rw-r--r-- | skins/larry/ui.js | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/skins/classic/common.css b/skins/classic/common.css index 10bc91c09..390522fe8 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -597,6 +597,10 @@ img.uploading height: 16px; } +.mce-btn button { + height: 28px; +} + /***** common table settings ******/ table.records-table thead tr td diff --git a/skins/classic/functions.js b/skins/classic/functions.js index 07df6391c..aaaf393e7 100644 --- a/skins/classic/functions.js +++ b/skins/classic/functions.js @@ -543,10 +543,9 @@ resize_compose_body: function() w = div.width() - 2, h = div.height(), x = bw.ie || bw.opera ? 4 : 0; - $('#compose-body_tbl').width((w+3)+'px').height(''); - $('#compose-body_ifr').width((w+3)+'px').height((h-54)+'px'); - $('#compose-body').width((w-x)+'px').height(h+'px'); - $('#googie_edit_layer').height(h+'px'); + $('#compose-body_ifr').width(w+3).height(h-2 - $('div.mce-toolbar').height()); + $('#compose-body').width(w-x).height(h); + $('#googie_edit_layer').height(h); }, resize_compose_body_ev: function() diff --git a/skins/larry/ui.js b/skins/larry/ui.js index a173ffd1d..c85c37257 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -528,7 +528,7 @@ function rcube_mail_ui() body.width(w).height(h); $('#composebodycontainer > div').width(w+8).css('margin-top', '1px'); - $('#composebody_ifr').height(h + 4 - $('.mce-toolbar-grp').height()); + $('#composebody_ifr').height(h + 4 - $('div.mce-toolbar').height()); $('#googie_edit_layer').height(h - 8); // $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons'); // $('#composeformbuttons')[(btns ? 'show' : 'hide')](); |