diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a965219..e07d5718d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This file includes only changes we consider noteworthy for users, admins and plu - Add tooltip with folder name to widescreen list of multi-folder listing (#9989, #7950) - Add ability to chose from all available contact fields on CSV import (#9419) - Password: Removed the (insecure) virtualmin driver (#8007) +- Fix jqueryui plugin's minicolors.css issue with custom skins (#9967) ## Release 1.7-beta2 diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index bb50b2051..db8570a52 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -118,7 +118,12 @@ class jqueryui extends rcube_plugin $config = ['theme' => $colors_theme]; $config_str = rcube_output::json_serialize($config); - $rcube->output->include_css('plugins/jqueryui/' . $css); + if (!array_key_exists('elastic', (array) $rcube->output->skins)) { + $rcube->output->include_css($css); + } else { + $rcube->output->include_css('plugins/jqueryui/' . $css); + } + $rcube->output->include_script($script, 'head', false); $rcube->output->add_script('$.fn.miniColors = $.fn.minicolors; $("input.colors").minicolors(' . $config_str . ')', 'docready'); $rcube->output->set_env('minicolors_config', $config);