From 16cc7ed7a97c7525c006a0355bd0c1277c256cab Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 8 Apr 2012 16:20:09 +0100 Subject: removed names from footnotes and removed anchors from headings altogether --- lib/tpl/default/design.css | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index a94f814aa..6e249372b 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -265,11 +265,6 @@ div.dokuwiki a:active { text-decoration: underline; } -div.dokuwiki h1 a, -div.dokuwiki h2 a, -div.dokuwiki h3 a, -div.dokuwiki h4 a, -div.dokuwiki h5 a, div.dokuwiki a.nolink { color: __text__ !important; text-decoration: none !important; -- cgit v1.2.3 From 940db3a35fd0feb1f5540a789e79c4a3e192c115 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 8 Apr 2012 16:28:39 +0100 Subject: use abbr instead of deprecated acronym --- lib/tpl/default/design.css | 2 +- lib/tpl/default/print.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 6e249372b..1124cfe92 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -382,7 +382,7 @@ div.dokuwiki img.middle { vertical-align: middle; } -div.dokuwiki acronym { +div.dokuwiki abbr { cursor: help; border-bottom: 1px dotted __text__; } diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 45b60aad2..4387dc4bf 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -200,7 +200,7 @@ a.fn_bot { font-weight: bold; } -acronym { +abbr { border: 0; } -- cgit v1.2.3 From 8e38227f7e8647e3f99b6ce1cbaae4041bd959df Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 8 Apr 2012 17:45:05 +0100 Subject: renamed smiley image class to 'icon' (FS#1970) --- lib/tpl/default/design.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 1124cfe92..9d2cc1844 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -378,7 +378,7 @@ div.dokuwiki img.mediacenter { } /* smileys */ -div.dokuwiki img.middle { +div.dokuwiki img.icon { vertical-align: middle; } -- cgit v1.2.3 From 0607bfee2c4334d31415541abb89026e77c7628a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 8 Apr 2012 20:01:24 +0100 Subject: added some wanting classes --- lib/tpl/default/_mediamanager.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 68fa2e97f..8c605f69a 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -343,18 +343,18 @@ /*____________ Revisions form ____________*/ -#mediamanager__page #page__revisions ul { +#mediamanager__page form.changes ul { margin-left: 10px; list-style-type: none; } -#mediamanager__page #page__revisions ul li div.li div { +#mediamanager__page form.changes ul li div.li div { font-size: 90%; color: __text_neu__; padding-left: 18px; } -#mediamanager__page #page__revisions ul li div.li input { +#mediamanager__page form.changes ul li div.li input { position: relative; top: 1px; } -- cgit v1.2.3 From d5acc30de20298eb6ed7545e70484599c4d95867 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 9 Apr 2012 17:36:33 +0100 Subject: rewrote and improved HTML for TOC Attention: Template authors need to adjust their CSS! Original structure: div.toc > div#toc__header.tocheader.toctoggle > span#toc__toggle.toc_close|toc_open > span div#toc__inside > ul.toc > li.level1 > div.li > span.li > a.toc New structure: div#dw__toc.open|close > h3 > strong > span ul.toc > li.toc > div.li > a --- lib/tpl/default/design.css | 33 ++++++++++++++++----------------- lib/tpl/default/print.css | 2 +- lib/tpl/default/rtl.css | 18 ++++++++++++------ 3 files changed, 29 insertions(+), 24 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 9d2cc1844..48438527e 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -547,7 +547,7 @@ div.dokuwiki table.inline td { /* ---------- table of contents ------------------- */ -div.dokuwiki div.toc { +div.dokuwiki #dw__toc { margin: 1.2em 0 0 2em; float: right; width: 200px; @@ -555,46 +555,45 @@ div.dokuwiki div.toc { clear: both; } -div.dokuwiki div.tocheader { +div.dokuwiki #dw__toc h3 { border: 1px solid __border__; background-color: __background_alt__; text-align: left; font-weight: bold; padding: 3px; - margin-bottom: 2px; + margin: 0 0 2px 0; + font-size: 1em; } -div.dokuwiki span.toc_open, -div.dokuwiki span.toc_close { +div.dokuwiki #dw__toc h3 strong { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki span.toc_open span, -div.dokuwiki span.toc_close span { +div.dokuwiki #dw__toc h3 strong span { display: none; } -div.dokuwiki span.toc_open { +div.dokuwiki #dw__toc.close h3 strong { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki span.toc_close { +div.dokuwiki #dw__toc.open h3 strong { margin-top: 0; border-bottom: 0.4em solid __text__; } -div.dokuwiki #toc__inside { +div.dokuwiki #dw__toc > div { border: 1px solid __border__; background-color: __background__; text-align: left; padding: 0.5em 0 0.7em 0; } -div.dokuwiki ul.toc { +div.dokuwiki #dw__toc ul { list-style-type: none; list-style-image: none; line-height: 1.2em; @@ -602,23 +601,23 @@ div.dokuwiki ul.toc { margin: 0; } -div.dokuwiki ul.toc li { +div.dokuwiki #dw__toc ul li { background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat; padding-left: 0.4em; } -div.dokuwiki ul.toc li.clear { +div.dokuwiki #dw__toc ul li.clear { background-image: none; padding-left: 0.4em; } -div.dokuwiki a.toc:link, -div.dokuwiki a.toc:visited { +div.dokuwiki #dw__toc a:link, +div.dokuwiki #dw__toc a:visited { color: __extern__; } -div.dokuwiki a.toc:hover, -div.dokuwiki a.toc:active { +div.dokuwiki #dw__toc a:hover, +div.dokuwiki #dw__toc a:active { color: __text__; } diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 4387dc4bf..f83e8c97c 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -224,5 +224,5 @@ table.inline td { border: 1px solid #000000; } -.toc, .footerinc, .header, .bar, .user { display: none; } +#dw__toc, .footerinc, .header, .bar, .user { display: none; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 82c85839b..32a8ddb6d 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -89,30 +89,36 @@ div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; } div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; } /* TOC control */ -div.dokuwiki div.toc { +div.dokuwiki #dw__toc { float: left; + margin: 1.2em 2em 0 0; } -div.dokuwiki div.tocheader { +div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki #toc__inside { +div.dokuwiki #dw__toc h3 strong { + float: left; + margin: 0.4em 0 0 3px; +} + +div.dokuwiki #dw__toc > div { text-align: right; } -div.dokuwiki ul.toc { +div.dokuwiki #dw__toc ul { padding: 0; padding-right: 1em; } -div.dokuwiki ul.toc li { +div.dokuwiki #dw__toc ul li { background-position: right 0.6em; padding-right: 0.4em; direction: rtl; } -div.dokuwiki ul.toc li.clear { +div.dokuwiki #dw__toc ul li.clear { padding-right: 0.4em; } -- cgit v1.2.3 From 91b05b6bf9cb9fd3aeced777159422f4e8114a9c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 9 Apr 2012 19:06:15 +0100 Subject: improved HTML for search results Attention: Template authors need to adjust their CSS! Original structure: div.search_result > a.wikilink1 > span.search_cnt br div.search_snippet New structure: dl.search_results > dt > a.wikilink1 dd --- lib/tpl/default/design.css | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 48438527e..300b62a15 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -706,12 +706,20 @@ div.insitu-footnote { } /* --------------- search result formating --------------- */ -div.dokuwiki .search_result { - margin-bottom: 6px; +#dw__loading { + text-align: center; + margin-bottom: 1em; +} + +div.dokuwiki .search_results { padding: 0 10px 0 30px; } -div.dokuwiki .search_snippet { +div.dokuwiki .search_results dt { + margin-bottom: 3px; +} +div.dokuwiki .search_results dd { + margin-bottom: 6px; color: __text_other__; font-size: 12px; margin-left: 20px; -- cgit v1.2.3 From c8388e443bcd0c09a0b142b31819d48abd559aa0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 20 Apr 2012 17:20:17 +0200 Subject: made TOC togling script more generic Instead of a dedicated function to toggle the TOC we now have a function that allows to use this functionality everywhere. This will be used to toggle the sidebar in the mobile view (in an upcoming patch). Note, this required some changes to the CSS (to make it more generic). The CSS is still located in the TOC sections but should probably be moved into its own section instead. --- lib/tpl/default/design.css | 10 ++++++---- lib/tpl/default/rtl.css | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 300b62a15..44ccc0343 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -565,23 +565,25 @@ div.dokuwiki #dw__toc h3 { font-size: 1em; } -div.dokuwiki #dw__toc h3 strong { +div.dokuwiki .toggle_close .toggle, +div.dokuwiki .toggle_open .toggle { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki #dw__toc h3 strong span { +div.dokuwiki .toggle_open .toggle span, +div.dokuwiki .toggle_close .toggle span { display: none; } -div.dokuwiki #dw__toc.close h3 strong { +div.dokuwiki .toggle_close .toggle { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki #dw__toc.open h3 strong { +div.dokuwiki .toggle_open .toggle { margin-top: 0; border-bottom: 0.4em solid __text__; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 32a8ddb6d..b9dd82902 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -98,7 +98,8 @@ div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki #dw__toc h3 strong { +div.dokuwiki .toggle_close .toggle, +div.dokuwiki .toggle_open .toggle { float: left; margin: 0.4em 0 0 3px; } -- cgit v1.2.3 From 48722ac855c79944285cbe8958fe5ed03bd835ed Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Apr 2012 21:19:59 +0100 Subject: improved toc changes and sidebar toggling --- lib/tpl/default/design.css | 10 ++++------ lib/tpl/default/rtl.css | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 44ccc0343..3405ec258 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -565,25 +565,23 @@ div.dokuwiki #dw__toc h3 { font-size: 1em; } -div.dokuwiki .toggle_close .toggle, -div.dokuwiki .toggle_open .toggle { +div.dokuwiki .toggle strong { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki .toggle_open .toggle span, -div.dokuwiki .toggle_close .toggle span { +div.dokuwiki .toggle span { display: none; } -div.dokuwiki .toggle_close .toggle { +div.dokuwiki .toggle.closed strong { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki .toggle_open .toggle { +div.dokuwiki .toggle.open strong { margin-top: 0; border-bottom: 0.4em solid __text__; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index b9dd82902..8b2837874 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -98,8 +98,7 @@ div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki .toggle_close .toggle, -div.dokuwiki .toggle_open .toggle { +div.dokuwiki .toggle strong { float: left; margin: 0.4em 0 0 3px; } -- cgit v1.2.3 From e260f93b6cea05bc39bbd77b9db5bdc0c2c424bf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 5 Jul 2012 22:58:24 +0100 Subject: xml compatibility fixes (mainly entities to unicode conversions) --- lib/tpl/default/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 3e85c58f2..9a14f29a2 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -61,7 +61,7 @@ if (!defined('DOKU_INC')) die();
-   +  
@@ -121,7 +121,7 @@ if (!defined('DOKU_INC')) die(); -   +  
-- cgit v1.2.3