fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-12 05:22:35 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1556 fix auto-detection of dark mode even when it is disabled

Browse source
This commit is contained in:
Kijin Sung 2021-01-10 00:39:53 +09:00
parent e3fa780295
commit 44ecff5e55
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@
.light_dark(@cs) when not (@cs = moono-dark) { .light_dark(@cs) when not (@cs = moono-dark) {
background-color: #fff; background-color: #fff;
color: #000; color: #000;
&.color_scheme_dark { &.color_scheme_dark.cke_auto_dark_mode {
background-color: #333; background-color: #333;
color: #fff; color: #fff;
} }
@ -57,7 +57,7 @@
} }
} }
.light_dark_top(@cs) when not (@cs = moono-dark) { .light_dark_top(@cs) when not (@cs = moono-dark) {
.color_scheme_dark & { .color_scheme_dark.cke_auto_dark_mode & {
background: #333; background: #333;
border-color: #555; border-color: #555;
.cke_button_on { .cke_button_on {

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

@ -96,6 +96,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
var editor_skin = '{$colorset}'; var editor_skin = '{$colorset}';
var editor_color = null; var editor_color = null;
<!--@if($editor_auto_dark_mode)--> <!--@if($editor_auto_dark_mode)-->
$('body').addClass('cke_auto_dark_mode');
if (getColorScheme() === 'dark') { if (getColorScheme() === 'dark') {
if (editor_skin !== 'moono-lisa' ) { if (editor_skin !== 'moono-lisa' ) {
editor_skin = 'moono-dark'; editor_skin = 'moono-dark';

3
modules/editor/tpl/js/editor.app.js
View file

@ -84,7 +84,8 @@ function getAutoSavedSrl(ret_obj, response_tags, c) {
var fo_obj = getCkFormInstance(editor_sequence); var fo_obj = getCkFormInstance(editor_sequence);
this.ckeconfig = $.extend({}, default_ckeconfig, opts.ckeconfig || {}); this.ckeconfig = $.extend({}, default_ckeconfig, opts.ckeconfig || {});
this.ckeconfig.bodyClass = this.ckeconfig.bodyClass + ' color_scheme_' + getColorScheme(); this.ckeconfig.bodyClass = this.ckeconfig.bodyClass + ' color_scheme_' + getColorScheme() +
($('body').hasClass('cke_auto_dark_mode') ? ' cke_auto_dark_mode' : '');
this.editor_sequence = data.editorSequence; this.editor_sequence = data.editorSequence;
$form.attr('editor_sequence', data.editorSequence); $form.attr('editor_sequence', data.editorSequence);