Fixes Issue #350

Make sure to put user.css after plugin output so that it can override it.
This commit is contained in:
Garvin Hicking 2015-06-26 12:59:52 +02:00
parent 49ed5fcc42
commit 64f32ef864
2 changed files with 7 additions and 5 deletions

View File

@ -92,9 +92,11 @@ Version 2.0.2 ()
background-image: url({TEMPLATE_PATH}img/example.jpg);
}
since the content will be appended (sig!) to the streamed
serendipity dynamic stylesheet. (Issue #280, down below, talks
about the user styles "being prepended on top").
Content of a user.css will always be put LAST into the combined
CSS, this means it will override any possible plugin output.
If a user.css file does not exist in your own template directory,
but inside the default 2k11 template directory, this will always
be used (this behaviour is called "default fallback chain").
* Use https URLs for Atom feed, if called through HTTPS (hboeck)

View File

@ -85,13 +85,13 @@ $out .= serendipity_printStylesheet(
serendipity_getTemplateFile($css_file, '')
);
serendipity_plugin_api::hook_event($css_hook, $out);
$out .= serendipity_printStylesheet(
serendipity_getTemplateFile($css_userfile, 'serendipityPath', true),
serendipity_getTemplateFile($css_userfile, '', true)
);
serendipity_plugin_api::hook_event($css_hook, $out);
echo $out;
//