removed template dependencies from underscored CSS files in new defau…

…lt template
dokuwiki · Oct 10, 2012 · 5db35f6 · 5db35f6
1 parent 650d96f
commit 5db35f6
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 16 deletions.
diff --git a/lib/tpl/dokuwiki/images/icons-license.txt → lib/images/README b/lib/tpl/dokuwiki/images/icons-license.txt → lib/images/README
@@ -1,4 +1,5 @@
-Icons for:  sitetools.png, email.png, external-link.png and unc.png
+
+Icons:      email.png, external-link.png, unc.png
 Icon set:   Dusseldorf
 Designer:   pc.de
 License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]

diff --git a/lib/tpl/dokuwiki/images/bullet.png → lib/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png → lib/images/bullet.png
diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png → lib/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png → lib/images/closed-rtl.png
diff --git a/lib/tpl/dokuwiki/images/closed.png → lib/images/closed.png b/lib/tpl/dokuwiki/images/closed.png → lib/images/closed.png
diff --git a/lib/tpl/dokuwiki/images/email.png → lib/images/email.png b/lib/tpl/dokuwiki/images/email.png → lib/images/email.png
diff --git a/lib/tpl/dokuwiki/images/external-link.png → lib/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png → lib/images/external-link.png
diff --git a/lib/tpl/dokuwiki/images/open.png → lib/images/open.png b/lib/tpl/dokuwiki/images/open.png → lib/images/open.png
diff --git a/lib/tpl/dokuwiki/images/unc.png → lib/images/unc.png b/lib/tpl/dokuwiki/images/unc.png → lib/images/unc.png
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
@@ -6,13 +6,9 @@
 
 /* existing wikipage */
 .dokuwiki a.wikilink1 {
-    color: __existing__;
-    background-color: inherit;
 }
 /* not existing wikipage */
 .dokuwiki a.wikilink2 {
-    color: __missing__;
-    background-color: inherit;
     text-decoration: none;
 }
 .dokuwiki a.wikilink2:link,
@@ -43,15 +39,15 @@
 }
 /* external link */
 .dokuwiki a.urlextern {
-    background-image: url(images/external-link.png);
+    background-image: url(../../images/external-link.png);
 }
 /* windows share */
 .dokuwiki a.windows {
-    background-image: url(images/unc.png);
+    background-image: url(../../images/unc.png);
 }
 /* email link */
 .dokuwiki a.mail {
-    background-image: url(images/email.png);
+    background-image: url(../../images/email.png);
 }
 
 /* icons of the following are set by dokuwiki in lib/exe/css.php */

diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
@@ -80,14 +80,14 @@
     padding-right: 0;
 }
 .dokuwiki ul.idx li {
-    list-style-image: url(images/bullet.png);
+    list-style-image: url(../../images/bullet.png);
 }
 .dokuwiki ul.idx li.open {
-    list-style-image: url(images/open.png);
+    list-style-image: url(../../images/open.png);
 }
 .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed.png);
+    list-style-image: url(../../images/closed.png);
 }
 [dir=rtl] .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed-rtl.png);
+    list-style-image: url(../../images/closed-rtl.png);
 }
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
@@ -6,7 +6,6 @@
  * @author Clarence Lee <clarencedglee@gmail.com>
  */
 
-
 /*____________ section indenting ____________
 
 .dokuwiki.page  h1 {margin-left: 0;}
@@ -34,6 +33,20 @@
 /* hx margin-left = (1 / font-size) * .levelx-margin */
 
 
+/*____________ links to wiki pages (addition to _links) ____________*/
+
+/* existing wikipage */
+.dokuwiki a.wikilink1 {
+    color: __existing__;
+    background-color: inherit;
+}
+/* not existing wikipage */
+.dokuwiki a.wikilink2 {
+    color: __missing__;
+    background-color: inherit;
+}
+
+
 /*____________ images ____________*/
 
 /* embedded images (styles are already partly set in lib/styles/all.css) */

diff --git a/lib/tpl/dokuwiki/images/license.txt b/lib/tpl/dokuwiki/images/license.txt
@@ -0,0 +1,5 @@
+Icons for:  sitetools.png
+Icon set:   Dusseldorf
+Designer:   pc.de
+License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
+URL:        http://pc.de/icons/#Dusseldorf
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
@@ -54,6 +54,9 @@ __background_neu__  = "#ddd"
 ; border color
 __border__          = "#ccc"
 
+; highlighted text (e.g. search snippets)
+__highlight__       = "#ff9"
+
 ;--------------------------------------------------------------------------
 
 __background_site__ = "#fbfaf9"
@@ -63,9 +66,6 @@ __link__            = "#2b73b7"
 __existing__        = "#080"
 __missing__         = "#d30"
 
-; highlighting search snippets
-__highlight__       = "#ff9"
-
 ; site and sidebar widths
 __site_width__      = "75em"
 __sidebar_width__   = "16em"