Skip to content

Commit

Permalink
Fixes Issue #350
Browse files Browse the repository at this point in the history
Make sure to put user.css after plugin output so that it can override it.
  • Loading branch information
garvinhicking committed Jun 26, 2015
1 parent 49ed5fc commit 64f32ef
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions docs/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions serendipity.css.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ function serendipity_printStylesheet($file, $dir = '') {
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;

//
Expand Down

0 comments on commit 64f32ef

Please sign in to comment.