From 89d6ce68463b92641946551b07ec49b023d56d90 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 1 May 2014 11:48:29 +0200
Subject: Update to TinyMCE 4.x

---
 skins/classic/common.css   | 4 ++++
 skins/classic/functions.js | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'skins/classic')

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()
-- 
cgit v1.2.3