Skip to content

Commit b81d998

Browse files
committed
Fix jqueryui plugin's minicolors.css issue with custom skins (#9967)
1 parent 3a75f89 commit b81d998

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This file includes only changes we consider noteworthy for users, admins and plu
1010
- Add tooltip with folder name to widescreen list of multi-folder listing (#9989, #7950)
1111
- Add ability to chose from all available contact fields on CSV import (#9419)
1212
- Password: Removed the (insecure) virtualmin driver (#8007)
13+
- Fix jqueryui plugin's minicolors.css issue with custom skins (#9967)
1314

1415
## Release 1.7-beta2
1516

plugins/jqueryui/jqueryui.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,12 @@ public static function miniColors()
118118
$config = ['theme' => $colors_theme];
119119
$config_str = rcube_output::json_serialize($config);
120120

121-
$rcube->output->include_css('plugins/jqueryui/' . $css);
121+
if (!array_key_exists('elastic', (array) $rcube->output->skins)) {
122+
$rcube->output->include_css($css);
123+
} else {
124+
$rcube->output->include_css('plugins/jqueryui/' . $css);
125+
}
126+
122127
$rcube->output->include_script($script, 'head', false);
123128
$rcube->output->add_script('$.fn.miniColors = $.fn.minicolors; $("input.colors").minicolors(' . $config_str . ')', 'docready');
124129
$rcube->output->set_env('minicolors_config', $config);

0 commit comments

Comments
 (0)