From 5db35f6f9b815f87ace9af277ca6e07a6edf9ae7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 10 Oct 2012 11:12:21 +0100 Subject: removed template dependencies from underscored CSS files in new default template --- lib/images/README | 6 ++++++ lib/images/bullet.png | Bin 0 -> 112 bytes lib/images/closed-rtl.png | Bin 0 -> 118 bytes lib/images/closed.png | Bin 0 -> 119 bytes lib/images/email.png | Bin 0 -> 659 bytes lib/images/external-link.png | Bin 0 -> 816 bytes lib/images/open.png | Bin 0 -> 118 bytes lib/images/unc.png | Bin 0 -> 553 bytes 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/bullet.png | Bin 112 -> 0 bytes lib/tpl/dokuwiki/images/closed-rtl.png | Bin 118 -> 0 bytes lib/tpl/dokuwiki/images/closed.png | Bin 119 -> 0 bytes lib/tpl/dokuwiki/images/email.png | Bin 659 -> 0 bytes lib/tpl/dokuwiki/images/external-link.png | Bin 816 -> 0 bytes lib/tpl/dokuwiki/images/icons-license.txt | 5 ----- lib/tpl/dokuwiki/images/license.txt | 5 +++++ lib/tpl/dokuwiki/images/open.png | Bin 118 -> 0 bytes lib/tpl/dokuwiki/images/unc.png | Bin 553 -> 0 bytes lib/tpl/dokuwiki/style.ini | 6 +++--- 21 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 lib/images/README create mode 100644 lib/images/bullet.png create mode 100644 lib/images/closed-rtl.png create mode 100644 lib/images/closed.png create mode 100644 lib/images/email.png create mode 100644 lib/images/external-link.png create mode 100644 lib/images/open.png create mode 100644 lib/images/unc.png delete mode 100644 lib/tpl/dokuwiki/images/bullet.png delete mode 100644 lib/tpl/dokuwiki/images/closed-rtl.png delete mode 100644 lib/tpl/dokuwiki/images/closed.png delete mode 100644 lib/tpl/dokuwiki/images/email.png delete mode 100644 lib/tpl/dokuwiki/images/external-link.png delete mode 100644 lib/tpl/dokuwiki/images/icons-license.txt create mode 100644 lib/tpl/dokuwiki/images/license.txt delete mode 100644 lib/tpl/dokuwiki/images/open.png delete mode 100644 lib/tpl/dokuwiki/images/unc.png diff --git a/lib/images/README b/lib/images/README new file mode 100644 index 000000000..e2788b400 --- /dev/null +++ b/lib/images/README @@ -0,0 +1,6 @@ + +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/] +URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/images/bullet.png b/lib/images/bullet.png new file mode 100644 index 000000000..5e557b334 Binary files /dev/null and b/lib/images/bullet.png differ diff --git a/lib/images/closed-rtl.png b/lib/images/closed-rtl.png new file mode 100644 index 000000000..caa027e34 Binary files /dev/null and b/lib/images/closed-rtl.png differ diff --git a/lib/images/closed.png b/lib/images/closed.png new file mode 100644 index 000000000..e3bd0f9e9 Binary files /dev/null and b/lib/images/closed.png differ diff --git a/lib/images/email.png b/lib/images/email.png new file mode 100644 index 000000000..d1d4a5fd5 Binary files /dev/null and b/lib/images/email.png differ diff --git a/lib/images/external-link.png b/lib/images/external-link.png new file mode 100644 index 000000000..a4d5de17c Binary files /dev/null and b/lib/images/external-link.png differ diff --git a/lib/images/open.png b/lib/images/open.png new file mode 100644 index 000000000..5f2d408c5 Binary files /dev/null and b/lib/images/open.png differ diff --git a/lib/images/unc.png b/lib/images/unc.png new file mode 100644 index 000000000..a552d6e6f Binary files /dev/null and b/lib/images/unc.png differ 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 */ - /*____________ 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/bullet.png b/lib/tpl/dokuwiki/images/bullet.png deleted file mode 100644 index 5e557b334..000000000 Binary files a/lib/tpl/dokuwiki/images/bullet.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png deleted file mode 100644 index caa027e34..000000000 Binary files a/lib/tpl/dokuwiki/images/closed-rtl.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png deleted file mode 100644 index e3bd0f9e9..000000000 Binary files a/lib/tpl/dokuwiki/images/closed.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png deleted file mode 100644 index d1d4a5fd5..000000000 Binary files a/lib/tpl/dokuwiki/images/email.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png deleted file mode 100644 index a4d5de17c..000000000 Binary files a/lib/tpl/dokuwiki/images/external-link.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/tpl/dokuwiki/images/icons-license.txt deleted file mode 100644 index 7e12bbbd4..000000000 --- a/lib/tpl/dokuwiki/images/icons-license.txt +++ /dev/null @@ -1,5 +0,0 @@ -Icons for: sitetools.png, email.png, external-link.png and unc.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/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/images/open.png b/lib/tpl/dokuwiki/images/open.png deleted file mode 100644 index 5f2d408c5..000000000 Binary files a/lib/tpl/dokuwiki/images/open.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png deleted file mode 100644 index a552d6e6f..000000000 Binary files a/lib/tpl/dokuwiki/images/unc.png and /dev/null differ 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" -- cgit v1.2.3