extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 03:11:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

no longer load TinyMCE styles for preview and change TinyMCE margin to 10px we have in preview

Browse Source
This commit is contained in:
ralf 2022-06-09 09:48:52 +02:00
parent 45ccceb1c7
commit 597a983264
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_widget_htmlarea.ts
View File

@ -278,8 +278,8 @@ export class et2_htmlarea extends et2_editableWidget implements et2_IResizeable
"Wingdings=wingdings,zapf dingbats", "Wingdings=wingdings,zapf dingbats",
fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt', fontsize_formats: '8pt 10pt 12pt 14pt 18pt 24pt 36pt',
content_css: egw.webserverUrl+'/api/tinymce.php?'+ // use the 3 prefs as cache-buster content_css: egw.webserverUrl+'/api/tinymce.php?'+ // use the 3 prefs as cache-buster
btoa(egw.preference('rte_font', 'common')+':'+ btoa(egw.preference('rte_font', 'common')+'::'+
egw.preference('rte_font_size', 'common')+':'+ egw.preference('rte_font_size', 'common')+'::'+
egw.preference('rte_font_unit', 'common')), egw.preference('rte_font_unit', 'common')),
}; };
const rte_formatblock = <string>(egw.preference('rte_formatblock', 'common') || 'p'); const rte_formatblock = <string>(egw.preference('rte_formatblock', 'common') || 'p');

8
api/src/Etemplate/Widget/HtmlArea.php
View File

@ -257,13 +257,13 @@ code {
} }
.mce-content-body:not([dir=rtl]) blockquote { .mce-content-body:not([dir=rtl]) blockquote {
border-left: 2px solid #ccc; border-left: 2px solid #ccc;
margin-left: 1.5rem; margin-left: 0;
padding-left: 1rem; padding-left: 10px;
} }
.mce-content-body[dir=rtl] blockquote { .mce-content-body[dir=rtl] blockquote {
border-right: 2px solid #ccc; border-right: 2px solid #ccc;
margin-right: 1.5rem; margin-right: 0;
padding-right: 1rem; padding-right: 10px;
} }
fieldset { fieldset {
border: 2px solid silver; border: 2px solid silver;

5
mail/inc/class.mail_ui.inc.php
View File

@ -3356,11 +3356,6 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$GLOBALS['egw_info']['flags']['nonavbar']=true; $GLOBALS['egw_info']['flags']['nonavbar']=true;
// do NOT include any default CSS // do NOT include any default CSS
Framework::includeCSS('mail', 'preview', true, true); 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 // load preview.js to activate mailto links
Framework::includeJS('/mail/js/preview.js'); Framework::includeJS('/mail/js/preview.js');