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

Merge branch 'editor-dark' into pr/editor-dark-mode

Browse source
This commit is contained in:
Min-Soo Kim 2021-01-08 01:26:58 +09:00 • committed by GitHub
commit e725455a0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 212 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/addon/addon.controller.php
View file

@ -130,7 +130,7 @@ class addonController extends addon
$buff[] = 'if ($run && file_exists($addon_file)):';
$buff[] = ' include($addon_file);';
$buff[] = ' $after_time = microtime(true);';
$buff[] = ' if (class_exists("Rhymix\\\\Framework\\\\Debug")):';
$buff[] = ' if (class_exists("Rhymix\\\\Framework\\\\Debug") && Rhymix\\Framework\\Debug::isEnabledForCurrentUser()):';
$buff[] = ' Rhymix\\Framework\\Debug::addTrigger(array(';
$buff[] = ' "name" => "addon." . $called_position,';
$buff[] = ' "target" => "' . $addon . '",';

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

@ -32,6 +32,27 @@
margin: 0 0 @content_paragraph_spacing 0;
}
/* if editor_auto_dark_mode == 'Y' load darkmode style */
.auto_dark(@cs, @adm) when (@adm = Y) and not (@cs = moono-dark) {
html {
body.cke_editable {
.light_dark(moono-dark);
}
}
.cke_reset {
span {
&.cke_top {
.light_dark_top(moono-dark);
}
}
}
.cke_button_icon, .cke_combo_button, .cke_button_arrow, .cke_button_label {
filter: invert(1);
}
}
.auto_dark(@cs, @adm) when not (@adm = Y) or (@cs = moono-dark) {
}
.light_dark(@cs) when (@cs = moono-dark) {
background-color: #333;
color: #fff;

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

@ -6,6 +6,7 @@
{@ $css_var->content_line_height = $content_line_height ? $content_line_height: 'none';}
{@ $css_var->content_word_break = $content_word_break ? $content_word_break : 'none';}
{@ $css_var->content_paragraph_spacing = $content_paragraph_spacing ? $content_paragraph_spacing : 'none';}
{@ $css_var->auto_dark_mode = ($editor_auto_dark_mode)? 'Y':'N' }
{@ Context::set('css_var',$css_var);}
<load target="css/default.less" vars="$css_var" />

13
modules/widget/widget.controller.php
View file

@ -652,11 +652,14 @@ class widgetController extends widget
$GLOBALS['__widget_excute_elapsed__'] = 0;
}
$GLOBALS['__widget_excute_elapsed__'] += $elapsed_time;
Rhymix\Framework\Debug::addWidget(array(
'name' => $widget,
'elapsed_time' => $elapsed_time,
));
if (Rhymix\Framework\Debug::isEnabledForCurrentUser())
{
Rhymix\Framework\Debug::addWidget(array(
'name' => $widget,
'elapsed_time' => $elapsed_time,
));
}
// Return result
return $output;
}