mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
loading template/theme and print css last, so they can overwrite anything
This commit is contained in:
parent
f51f7f5731
commit
9643d31dd1
@ -988,8 +988,6 @@ abstract class egw_framework
|
|||||||
{
|
{
|
||||||
$print_css = '/phpgwapi/templates/idots/print.css';
|
$print_css = '/phpgwapi/templates/idots/print.css';
|
||||||
}
|
}
|
||||||
self::includeCSS($print_css, null, false); // false = prepend (add as first) file
|
|
||||||
self::includeCSS($theme_css, null, false);
|
|
||||||
|
|
||||||
// Enhanced selectboxes (et1)
|
// Enhanced selectboxes (et1)
|
||||||
self::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css');
|
self::includeCSS('/phpgwapi/js/jquery/chosen/chosen.css');
|
||||||
@ -1000,6 +998,10 @@ abstract class egw_framework
|
|||||||
// search for app specific css file
|
// search for app specific css file
|
||||||
self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');
|
self::includeCSS($GLOBALS['egw_info']['flags']['currentapp'], 'app');
|
||||||
|
|
||||||
|
// sending template/theme and print css last, so they can overwrite anything
|
||||||
|
self::includeCSS($theme_css);
|
||||||
|
self::includeCSS($print_css);
|
||||||
|
|
||||||
// add all css files from self::includeCSS
|
// add all css files from self::includeCSS
|
||||||
$max_modified = 0;
|
$max_modified = 0;
|
||||||
$debug_minify = (bool)$GLOBALS['egw_info']['server']['debug_minify'];
|
$debug_minify = (bool)$GLOBALS['egw_info']['server']['debug_minify'];
|
||||||
|
Loading…
Reference in New Issue
Block a user