lessified more files

9 files changed, 135 insertions, 134 deletions

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.less
index ad04f7c41..1dd56813e 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -14,8 +14,8 @@ html {
 }
 html,
 body {
-    color: __text__;
-    background: __background_site__ url(images/page-gradient.png) top left repeat-x;
+    color: @ini_text;
+    background: @ini_background_site url(images/page-gradient.png) top left repeat-x;
     margin: 0;
     padding: 0;
 }
@@ -160,7 +160,7 @@ table {
     border-collapse: collapse;
     empty-cells: show;
     border-spacing: 0;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
 }
 
 caption {
@@ -176,11 +176,11 @@ td {
     padding: .3em .5em;
     margin: 0;
     vertical-align: top;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
 }
 th {
     font-weight: bold;
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
     text-align: left;
 }
 [dir=rtl] th {
@@ -196,7 +196,7 @@ a {
 a:link,
 a:visited {
     text-decoration: none;
-    color: __link__;
+    color: @ini_link;
 }
 a:link:hover,
 a:visited:hover,
@@ -233,8 +233,8 @@ button img {
 }
 
 hr {
-    border-top: solid __border__;
-    border-bottom: solid __background__;
+    border-top: solid @ini_border;
+    border-bottom: solid @ini_background;
     border-width: 1px 0;
     height: 0;
     text-align: center;
@@ -253,7 +253,7 @@ em abbr {
 }
 
 mark {
-    background-color: __highlight__;
+    background-color: @ini_highlight;
     color: inherit;
 }
 
@@ -266,23 +266,23 @@ kbd {
     font-size: 1em;
     direction: ltr;
     text-align: left;
-    background-color: __background_site__;
-    color: __text__;
-    box-shadow: inset 0 0 .3em __border__;
+    background-color: @ini_background_site;
+    color: @ini_text;
+    box-shadow: inset 0 0 .3em @ini_border;
     border-radius: 2px;
 }
 pre {
     overflow: auto;
     word-wrap: normal;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
     border-radius: 2px;
-    box-shadow: inset 0 0 .5em __border__;
+    box-shadow: inset 0 0 .5em @ini_border;
     padding: .7em 1em;
 }
 
 blockquote {
     padding: 0 .5em;
-    border: solid __border__;
+    border: solid @ini_border;
     border-width: 0 0 0 .25em;
 }
 [dir=rtl] blockquote {
@@ -321,7 +321,7 @@ form {
 fieldset {
     padding: .7em 1em 0;
     padding: .7rem 1rem; /* for those browsers understanding :last-child */
-    border: 1px solid __text_alt__;
+    border: 1px solid @ini_text_alt;
 }
 fieldset > :last-child {
     margin-bottom: 0;
@@ -403,11 +403,7 @@ button,
     color: #333;
     background-color: #eee;
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%");
     border: 1px solid #ccc;
     border-radius: 2px;
     padding: .1em .5em;
@@ -441,11 +437,7 @@ button:focus,
     border-color: #999;
     background-color: #ddd;
     background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
+    .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%");
 }
 
 input::-moz-focus-inner,
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index f6022b4e9..ae97d7d5e 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -122,7 +122,8 @@
 .dokuwiki dl.file {
     dt,
     dt {
-        .linear-gradient(@ini_background_site, @ini_background_alt, @ini_background_site);
+        background-color: @ini_background_site;
+        .linear-gradient(~"top, @{ini_background_alt} 0%, @{ini_background_site} 100%");
         color: inherit;
         border: 1px solid @ini_border;
         border-bottom-color: @ini_background_site;
diff --git a/lib/tpl/dokuwiki/css/includes.css b/lib/tpl/dokuwiki/css/includes.css
deleted file mode 100644
index bc189962f..000000000
--- a/lib/tpl/dokuwiki/css/includes.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * This file provides styles for included seperate html files
- * (added through "include hooks").
- */
diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less
index 7ecae4a0b..a88767e97 100644
--- a/lib/tpl/dokuwiki/css/mixins.less
+++ b/lib/tpl/dokuwiki/css/mixins.less
@@ -1,15 +1,10 @@
 /**
  * linear gradient x-browser support
- *
- * @param color fallback background color
- * @param start start color
- * @param stop  end color
  */
-.linear-gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
-    background: @color;
-    background: -moz-linear-gradient(   top, @start 0%, @stop 100%);
-    background: -webkit-linear-gradient(top, @start 0%, @stop 100%);
-    background: -o-linear-gradient(     top, @start 0%, @stop 100%);
-    background: -ms-linear-gradient(    top, @start 0%, @stop 100%);
-    background: linear-gradient(        top, @start 0%, @stop 100%);
+.linear-gradient(@declaration: 0) {
+    background: -moz-linear-gradient(   @declaration);
+    background: -webkit-linear-gradient(@declaration);
+    background: -o-linear-gradient(     @declaration);
+    background: -ms-linear-gradient(    @declaration);
+    background: linear-gradient(        @declaration);
 }
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.less
index 71f80599d..4362656a1 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -13,7 +13,7 @@
 
 /* for screen widths in the tablet range
 ********************************************************************/
-@media only screen and (max-width: __tablet_width__) {
+@media only screen and (max-width: @ini_tablet_width) {
 
 #screen__mode {
     z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
@@ -29,10 +29,10 @@
 [dir=rtl] #dokuwiki__aside > .pad {
     margin: 0 0 .5em;
     /* style like .page */
-    background: __background__;
+    background: @ini_background;
     color: inherit;
     border: 1px solid #eee;
-    box-shadow: 0 0 .5em __text_alt__;
+    box-shadow: 0 0 .5em @ini_text_alt;
     border-radius: 2px;
     padding: 1em;
     margin-bottom: .5em;
@@ -46,7 +46,7 @@
     padding-bottom: 0;
 }
 #dokuwiki__aside h3.toggle.open {
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
 }
 
 .showSidebar #dokuwiki__content {
@@ -69,7 +69,7 @@
     margin: 0 0 1em 0;
     width: auto;
     border-left-width: 0;
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
 }
 [dir=rtl] #dw__toc {
     float: none;
@@ -119,7 +119,7 @@
 
 /* for screen widths in the smartphone range
 ********************************************************************/
-@media only screen and (max-width: __phone_width__) {
+@media only screen and (max-width: @ini_phone_width) {
 
 #screen__mode {
     z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.less
index 21e5c13ec..21e5c13ec 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.less
diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css
deleted file mode 100644
index 00642e90b..000000000
--- a/lib/tpl/dokuwiki/css/structure.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * This file provides styles for the general layout structure.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-body {
-    margin: 0 auto;
-}
-#dokuwiki__site {
-    margin: 0 auto;
-    max-width: __site_width__;
-}
-#dokuwiki__site > .site {
-    padding: 0 .5em;
-}
-
-#dokuwiki__header {
-    width: 100%;
-}
-#dokuwiki__header > .pad {
-}
-    #dokuwiki__header .headings {
-        float: left;
-    }
-    [dir=rtl] #dokuwiki__header .headings {
-        float: right;
-        text-align: right;
-    }
-    #dokuwiki__header .tools {
-        float: right;
-        text-align: right;
-    }
-    [dir=rtl] #dokuwiki__header .tools {
-        float: left;
-        text-align: left;
-    }
-
-#dokuwiki__site .wrapper {
-    position: relative;
-}
-
-    #dokuwiki__aside {
-        width: __sidebar_width__;
-        float: left;
-        position: relative;
-        display: block;
-    }
-    [dir=rtl] #dokuwiki__aside {
-        float: right;
-    }
-    #dokuwiki__aside > .pad {
-        margin: 0 1.5em 0 0;
-    }
-    [dir=rtl] #dokuwiki__aside > .pad {
-        margin: 0 0 0 1.5em;
-    }
-
-    .showSidebar #dokuwiki__content {
-        float: right;
-        margin-left: -__sidebar_width__;
-        width: 100%;
-    }
-    [dir=rtl] .showSidebar #dokuwiki__content {
-        float: left;
-        margin-left: 0;
-        margin-right: -__sidebar_width__;
-    }
-    .showSidebar #dokuwiki__content > .pad {
-        margin-left: __sidebar_width__;
-    }
-    [dir=rtl] .showSidebar #dokuwiki__content > .pad {
-        margin-left: 0;
-        margin-right: __sidebar_width__;
-    }
-
-#dokuwiki__footer {
-    clear: both;
-}
-#dokuwiki__footer > .pad {
-}
diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
new file mode 100644
index 000000000..3f22f57e3
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -0,0 +1,94 @@
+/**
+ * This file provides styles for the general layout structure.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+body {
+    margin: 0 auto;
+}
+
+#dokuwiki__site {
+    margin: 0 auto;
+    max-width: @ini_site_width;
+}
+
+#dokuwiki__site > .site {
+    padding: 0 .5em;
+}
+
+#dokuwiki__header {
+    width: 100%;
+}
+
+#dokuwiki__header > .pad {
+}
+
+#dokuwiki__header .headings {
+    float: left;
+}
+
+[dir=rtl] #dokuwiki__header .headings {
+    float: right;
+    text-align: right;
+}
+
+#dokuwiki__header .tools {
+    float: right;
+    text-align: right;
+}
+
+[dir=rtl] #dokuwiki__header .tools {
+    float: left;
+    text-align: left;
+}
+
+#dokuwiki__site .wrapper {
+    position: relative;
+}
+
+#dokuwiki__aside {
+    width: @ini_sidebar_width;
+    float: left;
+    position: relative;
+    display: block;
+}
+
+[dir=rtl] #dokuwiki__aside {
+    float: right;
+}
+
+#dokuwiki__aside > .pad {
+    margin: 0 1.5em 0 0;
+}
+
+[dir=rtl] #dokuwiki__aside > .pad {
+    margin: 0 0 0 1.5em;
+}
+
+.showSidebar #dokuwiki__content {
+    float: right;
+    margin-left: -@ini_sidebar_width;
+    width: 100%;
+}
+
+[dir=rtl] .showSidebar #dokuwiki__content {
+    float: left;
+    margin-left: 0;
+    margin-right: -@ini_sidebar_width;
+}
+
+.showSidebar #dokuwiki__content > .pad {
+    margin-left: @ini_sidebar_width;
+}
+
+[dir=rtl] .showSidebar #dokuwiki__content > .pad {
+    margin-left: 0;
+    margin-right: @ini_sidebar_width;
+}
+
+#dokuwiki__footer {
+    clear: both;
+}
+
+#dokuwiki__footer > .pad {
+}
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 9cf6cb64f..c6962fcd2 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -9,12 +9,15 @@
 ; 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/mixins.less           = screen
 
-css/basic.css             = screen
+css/basic.less            = screen
 css/_imgdetail.css        = screen
 css/_media_popup.css      = screen
 css/_media_fullscreen.css = screen
@@ -32,17 +35,18 @@ css/_forms.css            = screen
 css/_admin.css            = screen
 css/structure.css         = screen
 css/design.less           = screen
-css/pagetools.css         = screen
-css/content.css           = screen
-css/includes.css          = 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]