From 5db35f6f9b815f87ace9af277ca6e07a6edf9ae7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 10 Oct 2012 11:12:21 +0100
Subject: [PATCH] removed template dependencies from underscored CSS files in
new default template
---
.../images/icons-license.txt => images/README} | 3 ++-
lib/{tpl/dokuwiki => }/images/bullet.png | Bin
lib/{tpl/dokuwiki => }/images/closed-rtl.png | Bin
lib/{tpl/dokuwiki => }/images/closed.png | Bin
lib/{tpl/dokuwiki => }/images/email.png | Bin
lib/{tpl/dokuwiki => }/images/external-link.png | Bin
lib/{tpl/dokuwiki => }/images/open.png | Bin
lib/{tpl/dokuwiki => }/images/unc.png | Bin
lib/tpl/dokuwiki/css/_links.css | 10 +++-------
lib/tpl/dokuwiki/css/_toc.css | 8 ++++----
lib/tpl/dokuwiki/css/content.css | 15 ++++++++++++++-
lib/tpl/dokuwiki/images/license.txt | 5 +++++
lib/tpl/dokuwiki/style.ini | 6 +++---
13 files changed, 31 insertions(+), 16 deletions(-)
rename lib/{tpl/dokuwiki/images/icons-license.txt => images/README} (72%)
rename lib/{tpl/dokuwiki => }/images/bullet.png (100%)
rename lib/{tpl/dokuwiki => }/images/closed-rtl.png (100%)
rename lib/{tpl/dokuwiki => }/images/closed.png (100%)
rename lib/{tpl/dokuwiki => }/images/email.png (100%)
rename lib/{tpl/dokuwiki => }/images/external-link.png (100%)
rename lib/{tpl/dokuwiki => }/images/open.png (100%)
rename lib/{tpl/dokuwiki => }/images/unc.png (100%)
create mode 100644 lib/tpl/dokuwiki/images/license.txt
diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/images/README
similarity index 72%
rename from lib/tpl/dokuwiki/images/icons-license.txt
rename to lib/images/README
index 7e12bbbd4..e2788b400 100644
--- a/lib/tpl/dokuwiki/images/icons-license.txt
+++ b/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 b/lib/images/bullet.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/bullet.png
rename to lib/images/bullet.png
diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/images/closed-rtl.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/closed-rtl.png
rename to lib/images/closed-rtl.png
diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/images/closed.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/closed.png
rename to lib/images/closed.png
diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/images/email.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/email.png
rename to lib/images/email.png
diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/images/external-link.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/external-link.png
rename to lib/images/external-link.png
diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/images/open.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/open.png
rename to lib/images/open.png
diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/images/unc.png
similarity index 100%
rename from lib/tpl/dokuwiki/images/unc.png
rename to lib/images/unc.png
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index e53ba45e5..7e5fb02cd 100644
--- 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
index 0d1b976d1..1226b5b5b 100644
--- 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
index 9f3eab0f0..1d3ae8c01 100644
--- 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
new file mode 100644
index 000000000..7d12604b6
--- /dev/null
+++ 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
index 242b43080..d0292e9b1 100644
--- 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"
--
GitLab