From 597a983264ee4e457f683a02890dfbe2bf2f447f Mon Sep 17 00:00:00 2001 From: ralf Date: Thu, 9 Jun 2022 09:48:52 +0200 Subject: [PATCH] no longer load TinyMCE styles for preview and change TinyMCE margin to 10px we have in preview --- api/js/etemplate/et2_widget_htmlarea.ts | 4 ++-- api/src/Etemplate/Widget/HtmlArea.php | 8 ++++---- mail/inc/class.mail_ui.inc.php | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/api/js/etemplate/et2_widget_htmlarea.ts b/api/js/etemplate/et2_widget_htmlarea.ts index 5d0d6fb4f6..aea8a45958 100644 --- a/api/js/etemplate/et2_widget_htmlarea.ts +++ b/api/js/etemplate/et2_widget_htmlarea.ts @@ -278,8 +278,8 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable "Wingdings=wingdings,zapf dingbats", fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt', content_css: egw.webserverUrl+'/api/tinymce.php?'+ // use the 3 prefs as cache-buster - btoa(egw.preference('rte_font', 'common')+':'+ - egw.preference('rte_font_size', 'common')+':'+ + btoa(egw.preference('rte_font', 'common')+'::'+ + egw.preference('rte_font_size', 'common')+'::'+ egw.preference('rte_font_unit', 'common')), }; const rte_formatblock = (egw.preference('rte_formatblock', 'common') || 'p'); diff --git a/api/src/Etemplate/Widget/HtmlArea.php b/api/src/Etemplate/Widget/HtmlArea.php index 264aae0ff9..3fa18f64a7 100644 --- a/api/src/Etemplate/Widget/HtmlArea.php +++ b/api/src/Etemplate/Widget/HtmlArea.php @@ -257,13 +257,13 @@ code { } .mce-content-body:not([dir=rtl]) blockquote { border-left: 2px solid #ccc; - margin-left: 1.5rem; - padding-left: 1rem; + margin-left: 0; + padding-left: 10px; } .mce-content-body[dir=rtl] blockquote { border-right: 2px solid #ccc; - margin-right: 1.5rem; - padding-right: 1rem; + margin-right: 0; + padding-right: 10px; } fieldset { border: 2px solid silver; diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 77b4742642..e8e21c750f 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -3356,11 +3356,6 @@ $filter['before']= date("d-M-Y", $cutoffdate2); $GLOBALS['egw_info']['flags']['nonavbar']=true; // do NOT include any default CSS Framework::includeCSS('mail', 'preview', true, true); - // include TinyMCE CSS prefs after preview CSS - Framework::includeCSS('/api/tinymce.php?'. // use the 3 prefs as cache-buster - base64_encode($GLOBALS['egw_info']['user']['preferences']['common']['rte_font'].':'. - $GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'].':'. - $GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'])); // load preview.js to activate mailto links Framework::includeJS('/mail/js/preview.js');