Merge remote-tracking branch 'origin/master' into diff_navigation

1 files changed, 31 insertions, 24 deletions

diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 77bb98236..cc23c169f 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -2,17 +2,23 @@
 ; for limitations of the ini format used here
 
 ; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
+; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing
+; any changes after an upgrade.
 ; Please don't forget to copy the section your changes should be under
 ; (i.e. [stylesheets] or [replacements]) into that file as well.
 
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
 ; print, screen and all are supported.
+; You can reference CSS and LESS files here. Files referenced here will
+; be checked for updates when considering a cache rebuild while files
+; included through LESS' @import statements are not
 
 [stylesheets]
 
-css/basic.css             = screen
+css/mixins.less           = screen
+
+css/basic.less            = screen
 css/_imgdetail.css        = screen
 css/_media_popup.css      = screen
 css/_media_fullscreen.css = screen
@@ -28,19 +34,20 @@ css/_edit.css             = screen
 css/_modal.css            = screen
 css/_forms.css            = screen
 css/_admin.css            = screen
-css/structure.css         = screen
-css/design.css            = screen
-css/pagetools.css         = screen
-css/content.css           = screen
-css/includes.css          = screen
+css/structure.less        = screen
+css/design.less           = screen
+css/pagetools.less        = screen
+css/content.less          = screen
 
-css/mobile.css            = all
+css/mobile.less           = all
 css/print.css             = print
 
 
 ; This section is used to configure some placeholder values used in
 ; the stylesheets. Changing this file is the simplest method to
 ; give your wiki a new look.
+; Placeholders defined here will also be made available as LESS variables
+; (with surrounding underscores removed, and the prefix @ini_ added)
 
 [replacements]
 
@@ -48,32 +55,32 @@ css/print.css             = print
 ;------ guaranteed dokuwiki color placeholders that every plugin can use
 
 ; main text and background colors
-__text__            = "#333"
-__background__      = "#fff"
+__text__            = "#333"            ; @ini_text
+__background__      = "#fff"            ; @ini_background
 ; alternative text and background colors
-__text_alt__        = "#999"
-__background_alt__  = "#eee"
+__text_alt__        = "#999"            ; @ini_text_alt
+__background_alt__  = "#eee"            ; @ini_background_alt
 ; neutral text and background colors
-__text_neu__        = "#666"
-__background_neu__  = "#ddd"
+__text_neu__        = "#666"            ; @ini_text_neu
+__background_neu__  = "#ddd"            ; @ini_background_neu
 ; border color
-__border__          = "#ccc"
+__border__          = "#ccc"            ; @ini_border
 
 ; highlighted text (e.g. search snippets)
-__highlight__       = "#ff9"
+__highlight__       = "#ff9"            ; @ini_highlight
 
 ;--------------------------------------------------------------------------
 
-__background_site__ = "#fbfaf9"
+__background_site__ = "#fbfaf9"         ; @ini_background_site
 
 ; these are used for links
-__link__            = "#2b73b7"
-__existing__        = "#080"
-__missing__         = "#d30"
+__link__            = "#2b73b7"         ; @ini_link
+__existing__        = "#080"            ; @ini_existing
+__missing__         = "#d30"            ; @ini_missing
 
 ; site and sidebar widths
-__site_width__      = "75em"
-__sidebar_width__   = "16em"
+__site_width__      = "75em"            ; @ini_site_width
+__sidebar_width__   = "16em"            ; @ini_sidebar_width
 ; cut off points for mobile devices
-__tablet_width__    = "800px"
-__phone_width__     = "480px"
+__tablet_width__    = "800px"           ; @ini_tablet_width
+__phone_width__     = "480px"           ; @ini_phone_width