From 8003b4936e64346b06c4c548fcf5b590baec9dd8 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 29 Nov 2017 21:19:53 +0100 Subject: [PATCH] include all.css after screen.css and add less files --- action.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/action.php b/action.php index 1c7bda9f..58f3f929 100644 --- a/action.php +++ b/action.php @@ -660,7 +660,6 @@ protected function load_css() { DOKU_INC . 'lib/styles/print.css' => DOKU_BASE . 'lib/styles/', ), - css_pluginstyles('all'), $this->css_pluginPDFstyles(), array( DOKU_PLUGIN . 'dw2pdf/conf/style.css' @@ -708,13 +707,21 @@ protected function css_pluginPDFstyles() { foreach($plugins as $p) { if(in_array($p, $usestyle)) { $list[DOKU_PLUGIN . "$p/screen.css"] = DOKU_BASE . "lib/plugins/$p/"; + $list[DOKU_PLUGIN . "$p/screen.less"] = DOKU_BASE . "lib/plugins/$p/"; + $list[DOKU_PLUGIN . "$p/style.css"] = DOKU_BASE . "lib/plugins/$p/"; + $list[DOKU_PLUGIN . "$p/style.less"] = DOKU_BASE . "lib/plugins/$p/"; } + $list[DOKU_PLUGIN . "$p/all.css"] = DOKU_BASE . "lib/plugins/$p/"; + $list[DOKU_PLUGIN . "$p/all.less"] = DOKU_BASE . "lib/plugins/$p/"; + if(file_exists(DOKU_PLUGIN . "$p/pdf.css")) { $list[DOKU_PLUGIN . "$p/pdf.css"] = DOKU_BASE . "lib/plugins/$p/"; + $list[DOKU_PLUGIN . "$p/pdf.less"] = DOKU_BASE . "lib/plugins/$p/"; } else { $list[DOKU_PLUGIN . "$p/print.css"] = DOKU_BASE . "lib/plugins/$p/"; + $list[DOKU_PLUGIN . "$p/print.less"] = DOKU_BASE . "lib/plugins/$p/"; } } return $list;