Update to TinyMCE 4.x

2 files changed, 3 insertions, 10 deletions

diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 049e4d5d4..07df6391c 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -940,10 +940,7 @@ function percent_indicator(obj, data)
 };
 
 // Optional parameters used by TinyMCE
-var rcmail_editor_settings = {
-  skin: "default", // "default", "o2k7"
-  skin_variant: "" // "", "silver", "black"
-};
+var rcmail_editor_settings = {};
 
 var rcmail_ui;
 
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 7f96289dd..a640c0817 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1520,15 +1520,11 @@ div.hide-headers
   outline: none;
 }
 
-#compose-body_tbl,
-#compose-body_tbl td
+.mce-container.mce-panel
 {
   border: none;
-}
-
-#compose-body_tbl tr.mceFirst td.mceToolbar
-{
   border-bottom: 1px solid #ccc;
+  background-image: none;
 }
 
 #compose-headers