diff options
author | Andreas Gohr <andi@splitbrain.org> | 2014-12-11 19:34:15 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2014-12-11 19:34:15 +0100 |
commit | 1517cb8444c231a57edfee2a6a1dfff4f05de493 (patch) | |
tree | 7d10c567f6ad72e47e63f7e133dbb83439fd2fb0 /inc | |
parent | 63d3c166fac4bf342edbd27ebb0b2b82b42d2066 (diff) | |
parent | 7b909d5e68cfee08dd85a3f28a2bdc9d6f41aaff (diff) | |
download | rpg-1517cb8444c231a57edfee2a6a1dfff4f05de493.tar.gz rpg-1517cb8444c231a57edfee2a6a1dfff4f05de493.tar.bz2 |
Merge pull request #954 from splitbrain/extendconfigcascade
Extendable config cascade for userstyles and userscript
Diffstat (limited to 'inc')
-rw-r--r-- | inc/config_cascade.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 1d9f67edb..a6dfadc80 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -49,13 +49,13 @@ $config_cascade = array_merge( 'local' => array(DOKU_CONF . 'wordblock.local.conf'), ), 'userstyle' => array( - 'screen' => DOKU_CONF . 'userstyle.css', - 'print' => DOKU_CONF . 'userprint.css', - 'feed' => DOKU_CONF . 'userfeed.css', - 'all' => DOKU_CONF . 'userall.css', + 'screen' => array(DOKU_CONF . 'userstyle.css', DOKU_CONF . 'userstyle.less'), + 'print' => array(DOKU_CONF . 'userprint.css', DOKU_CONF . 'userprint.less'), + 'feed' => array(DOKU_CONF . 'userfeed.css', DOKU_CONF . 'userfeed.less'), + 'all' => array(DOKU_CONF . 'userall.css', DOKU_CONF . 'userall.less') ), 'userscript' => array( - 'default' => DOKU_CONF . 'userscript.js' + 'default' => array(DOKU_CONF . 'userscript.js') ), 'acl' => array( 'default' => DOKU_CONF . 'acl.auth.php', |