Merge remote-tracking branch master into revisions

4 files changed, 2 insertions, 99 deletions

diff --git a/lib/tpl/dokuwiki/css/sites/abcwiki.css b/lib/tpl/dokuwiki/css/sites/abcwiki.css
deleted file mode 100644
index 9f436516b..000000000
--- a/lib/tpl/dokuwiki/css/sites/abcwiki.css
+++ /dev/null
@@ -1,39 +0,0 @@
-
-html,
-body {
-    background-color: #369;
-}
-
-#dokuwiki__header,
-#dokuwiki__aside,
-.docInfo,
-#dokuwiki__footer {
-    color: #fff;
-}
-
-#dokuwiki__header a,
-#dokuwiki__aside a,
-.docInfo a,
-#dokuwiki__footer a {
-    color: #ff9 !important;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-    color: #036;
-}
-
-.dokuwiki div.breadcrumbs {
-    border-top-color: #999;
-    border-bottom-color: #666;
-}
-.dokuwiki div.breadcrumbs div:first-child {
-    border-bottom-color: #999;
-}
-.dokuwiki div.breadcrumbs div:last-child {
-    border-top-color: #666;
-}
diff --git a/lib/tpl/dokuwiki/css/sites/paralis.css b/lib/tpl/dokuwiki/css/sites/paralis.css
deleted file mode 100644
index 201bca936..000000000
--- a/lib/tpl/dokuwiki/css/sites/paralis.css
+++ /dev/null
@@ -1,58 +0,0 @@
-
-@media screen {
-
-body {
-    font: normal 100%/1.4 Frutiger, Calibri, "Myriad Pro", Myriad, "Nimbus Sans L", Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-    font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif;
-    color: @ini_text_neu;
-}
-
-q {
-    font-style: italic;
-}
-
-#dokuwiki__header h1 a {
-    color: @ini_link;
-    font-weight: bold;
-}
-
-div.dokuwiki p.plugin__pagenav {
-    margin: 0 0 1.4em;
-}
-
-
-} /* /@media */
-
-
-#dokuwiki__header h1 {
-    position: relative;
-}
-#dokuwiki__header h1 img {
-    position: absolute;
-    top: -27px;
-    left: -33px;
-    max-width: none;
-}
-#dokuwiki__header h1 {
-    padding-left: 110px;
-}
-#dokuwiki__header p.claim {
-    padding-left: 110px;
-}
-
-
-@media print {
-
-.dokuwiki p.plugin__pagenav {
-    display: none;
-}
-
-} /* /@media */
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index 9d062655d..804d595ae 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
 author   Anika Henke
 email    anika@selfthinker.org
-date     2013-05-02
+date     2014-06-04
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 3c00ab8e8..558f262a7 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -46,7 +46,7 @@ require_once(DOKU_INC.'inc/init.php');
 // get merged style.ini
 define('SIMPLE_TEST', true); // hack to prevent css output and headers
 require_once(DOKU_INC.'lib/exe/css.php');
-$ini = css_styleini(tpl_incdir());
+$ini = css_styleini($conf['template']);
 
 if ($ini) {
     echo '<table>';