fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-29 23:53:31 +09:00
commit ffe9cda5e0
37 changed files with 2047 additions and 1931 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/editor/skins/ckeditor/css/default.less
View file

@ -52,8 +52,12 @@ html {
.light_dark(default);
}
body.cke_editable {
width: unset;
height: unset;
min-width: unset;
min-height: 100vh;
box-sizing: border-box;
margin: 0;
padding: 10px;
.light_dark(@colorset);
}
@ -88,7 +92,7 @@ p.editor_autosaved_message.autosave_message {
}
.xe_content.editable, .rhymix_content.editable {
.xe_content.editable, .rhymix_content.editable, .cke_wysiwyg_div {
.cont_font(@content_font);
.cont_fontsize(@content_font_size);
.cont_lineheight(@content_line_height);

1
modules/editor/skins/ckeditor/editor.html
View file

@ -158,6 +158,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
settings.ckeconfig.removePlugins = (settings.ckeconfig.removePlugins ? (settings.ckeconfig.removePlugins + ',') : '') + 'enterkey';
settings.loadXeComponent = false;
var additional_styles = '.cke_wysiwyg_div { padding: 8px !important; }';
additional_styles += 'html { min-width: unset; min-height: unset; width: unset; height: unset; margin: unset; padding: unset; }';
$('head').append('<st' + 'yle>' + additional_styles + String(css_content).replace(/\.xe_content\.editable/g, '.cke_wysiwyg_div') + '</st' + 'yle>');
}