From c51e95703cc34aca498b87ae89f78034a7cb8a54 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 23 Aug 2012 10:47:10 +0200 Subject: allow selects in block forms --- lib/tpl/dokuwiki/css/_forms.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index fb07e989a..3c7172226 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -36,6 +36,7 @@ text-align: right; } +.dokuwiki label.block select, .dokuwiki label.block input.edit { width: 50%; } -- cgit v1.2.3 From bf99c56fad56f9252f0a978d3b9e91a5a4579ad2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 26 Aug 2012 22:16:27 +0100 Subject: made tabs RTL-aware --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 10 ++++++++++ lib/tpl/dokuwiki/css/_tabs.css | 13 +++++++++++++ 2 files changed, 23 insertions(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 2811f2935..9f15d7bcb 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -87,6 +87,10 @@ /*____________ namespaces panel ____________*/ +[dir=rtl] #mediamanager__page .namespaces { + text-align: right; +} + #mediamanager__page .namespaces h2 { font-size: 1em; display: inline-block; @@ -103,6 +107,9 @@ *+html #mediamanager__page .namespaces h2 { display: inline; } +[dir=rtl] #mediamanager__page .namespaces h2 { + margin-right: 10px; +} #mediamanager__page .namespaces ul { margin-left: .2em; @@ -176,6 +183,9 @@ padding: 0; margin: 0; } +[dir=rtl] #mediamanager__page .filelist ul { + margin-right: 10px; +} #mediamanager__page .filelist .panelContent ul li:hover { background-color: __background_alt__; diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css index de544fd2b..1dffa8f7b 100644 --- a/lib/tpl/dokuwiki/css/_tabs.css +++ b/lib/tpl/dokuwiki/css/_tabs.css @@ -13,6 +13,9 @@ margin: 0; list-style: none; } +[dir=rtl] .dokuwiki ul.tabs li { + float: right; +} .dokuwiki ul.tabs li strong, .dokuwiki ul.tabs li a { @@ -23,6 +26,16 @@ color: __text__; border-radius: .5em .5em 0 0; } +[dir=rtl] .dokuwiki ul.tabs li strong, +[dir=rtl] .dokuwiki ul.tabs li a { + float: right; + margin: 0 0 0 .3em; +} +*+html[dir=rtl] .dokuwiki ul.tabs li strong, +*+html[dir=rtl] .dokuwiki ul.tabs li a { + float: none; + display: inline-block; +} .dokuwiki ul.tabs li strong { font-weight: normal; } -- cgit v1.2.3 From d836931ddf7db7f96da56cb7f6b4183cb139afe7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 26 Aug 2012 23:57:37 +0100 Subject: fixed quicksearch overlay being cut off in IE7 (FS#2581) --- lib/tpl/dokuwiki/css/design.css | 3 ++- lib/tpl/dokuwiki/css/plugins.css | 0 lib/tpl/dokuwiki/css/rtl.css | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 lib/tpl/dokuwiki/css/plugins.css create mode 100644 lib/tpl/dokuwiki/css/rtl.css (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 8a3f20729..12ec80687 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -180,8 +180,9 @@ font-size: 0.875em; position: relative; } -[dir=rtl] #IE7 #dokuwiki__sitetools form.search { +#IE7 #dokuwiki__sitetools form.search { min-height: 1px; + z-index: 21; } #dokuwiki__sitetools form.search input.edit { width: 18em; diff --git a/lib/tpl/dokuwiki/css/plugins.css b/lib/tpl/dokuwiki/css/plugins.css new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3 From ad739841082515fdacb61ae6b7abcde1dcd9ce1f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 8 Sep 2012 12:17:08 +0100 Subject: RTL improvements (mainly on media manager, FS#2569) --- lib/tpl/dokuwiki/css/_edit.css | 3 +++ lib/tpl/dokuwiki/css/_media_fullscreen.css | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index 374ddeb96..e4182774e 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -26,6 +26,9 @@ #tool__bar { float: left; } +[dir=rtl] #tool__bar { + float: right; +} /* buttons inside of toolbar */ .dokuwiki div.toolbar button.toolbutton { diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 9f15d7bcb..f795c6d65 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -158,6 +158,10 @@ line-height: 1; padding-left: 3px; } +[dir=rtl] #mediamanager__page .panelHeader ul li { + margin-right: 0; + margin-left: .5em; +} #mediamanager__page .panelHeader ul li.listType { padding-left: 30px; @@ -183,7 +187,7 @@ padding: 0; margin: 0; } -[dir=rtl] #mediamanager__page .filelist ul { +[dir=rtl] #mediamanager__page .filelist ul.tabs { margin-right: 10px; } @@ -222,6 +226,10 @@ position: relative; line-height: 1.2; } +[dir=rtl] #mediamanager__page .filelist .thumbs li { + margin-right: 0; + margin-left: 6px; +} * html #mediamanager__page .filelist .thumbs li, *+html #mediamanager__page .filelist .thumbs li { display: inline; -- cgit v1.2.3 From 8628c4fa004048e67f75cd638b6be0b26fe3132c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 9 Sep 2012 13:07:50 +0100 Subject: updated (and added missing) info.txt files --- lib/tpl/dokuwiki/template.info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index 3f904c6c8..dfac2ef4e 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ base dokuwiki -author Anika Henke, Andreas Gohr, Clarence Lee -email andi@splitbrain.org -date 2012-03-24 +author Anika Henke +email anika@selfthinker.org +date 2012-09-08 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From 27a8150a43aa6c4c88f168078fa0a684630b2d1b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 13 Sep 2012 17:06:45 +0100 Subject: deleted empty css files (How the hell did they get back in?) --- lib/tpl/dokuwiki/css/plugins.css | 0 lib/tpl/dokuwiki/css/rtl.css | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/tpl/dokuwiki/css/plugins.css delete mode 100644 lib/tpl/dokuwiki/css/rtl.css (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/plugins.css b/lib/tpl/dokuwiki/css/plugins.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3 From 1d93d6bdde1067a8ea641bdb2ce594d2fb3b78cf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 13 Sep 2012 17:07:35 +0100 Subject: corrected comment in style.ini --- lib/tpl/dokuwiki/style.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 45e68e3ed..242b43080 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -3,8 +3,7 @@ ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently -; print, screen and rtl are supported. rtl styles are loaded additionally -; to screen styles if a right-to-left language is selected (eg. Hebrew). +; print, screen and all are supported. [stylesheets] -- cgit v1.2.3 From ee8400d60f3958a974fce9d8a176a563d14ac734 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Sep 2012 21:00:15 +0100 Subject: let tables adjust to default width (FS#2598) --- lib/tpl/dokuwiki/css/content.css | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index ebeb4e17e..9f3eab0f0 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -70,7 +70,6 @@ /*____________ tables ____________*/ .dokuwiki div.table { - width: 100%; overflow-x: auto; margin-bottom: 1.4em; } -- cgit v1.2.3 From d33f2760e5d9ba44d858fef247c03fff3ca877f8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 16 Sep 2012 13:03:28 +0100 Subject: moved media manager resize image to core image folder --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 2 +- lib/tpl/dokuwiki/images/resizecol.png | Bin 158 -> 0 bytes 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 lib/tpl/dokuwiki/images/resizecol.png (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index f795c6d65..c67e16051 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -65,7 +65,7 @@ #mediamanager__page .ui-resizable-e { width: 6px; right: 2px; - background: transparent url(images/resizecol.png) center center no-repeat; + background: transparent url(../../images/resizecol.png) center center no-repeat; } #mediamanager__page .ui-resizable-e:hover { background-color: __background_alt__; diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png deleted file mode 100644 index b5aeec004..000000000 Binary files a/lib/tpl/dokuwiki/images/resizecol.png and /dev/null differ -- cgit v1.2.3 From 19e77bae285ac9b74c39b7bfe457bb2d8331984a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 17 Sep 2012 23:16:47 +0100 Subject: fixed checkboxes missing border in Opera (FS#2603) --- lib/tpl/dokuwiki/css/basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 4942de001..55c1d2dfe 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -320,7 +320,7 @@ select:focus { input[type=radio], input[type=checkbox] { padding: 0; - border-width: 0; + border-style: none; box-shadow: none; } -- cgit v1.2.3 From 07834a7c661d05ab5c707e1c428421c87af565bf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 25 Sep 2012 19:47:10 +0100 Subject: de-couple mobile JS from widths to actual media query equivalent (fixes FS#2623) --- lib/tpl/dokuwiki/css/mobile.css | 14 ++++++++++++++ lib/tpl/dokuwiki/main.php | 1 + lib/tpl/dokuwiki/script.js | 25 +++++++++++++++---------- 3 files changed, 30 insertions(+), 10 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 6e07f23ec..cc61ab06c 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,10 +5,20 @@ * @author Anika Henke */ +/* for detecting media queries in JavaScript (see script.js): */ +#screen__mode { + position: relative; + z-index: 0; +} + /* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { +#screen__mode { + z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ +} + /* structure */ #dokuwiki__aside { width: 100%; @@ -107,6 +117,10 @@ ********************************************************************/ @media only screen and (max-width: 480px) { +#screen__mode { + z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ +} + body { font-size: 100%; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 2406a206b..6b1e95d62 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
+
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index d858bda89..3ed8dbabe 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -12,18 +12,23 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ + // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here + var screen_mode = jQuery('#screen__mode').css('z-index'); + // determine our device pattern // TODO: consider moving into dokuwiki core - var w = document.body.clientWidth; - if (w > 979) { - if (device_class == 'desktop') return; - device_class = 'desktop'; - } else if (w > 480) { - if (device_class.match(/tablet/)) return; - device_class = 'mobile tablet'; - } else { - if (device_class.match(/phone/)) return; - device_class = 'mobile phone'; + switch (screen_mode) { + case '1': + if (device_class.match(/tablet/)) return; + device_class = 'mobile tablet'; + break; + case '2': + if (device_class.match(/phone/)) return; + device_class = 'mobile phone'; + break; + default: + if (device_class == 'desktop') return; + device_class = 'desktop'; } jQuery('html').removeClass(device_classes).addClass(device_class); -- cgit v1.2.3 From 20391a36885910a616110df30f3ce30f8d23639d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 25 Sep 2012 20:25:54 +0100 Subject: removed html dependency from media query detection JS in new template --- lib/tpl/dokuwiki/css/mobile.css | 15 +++++---------- lib/tpl/dokuwiki/main.php | 1 - lib/tpl/dokuwiki/script.js | 6 +++--- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index cc61ab06c..ea32fb11d 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,18 +5,16 @@ * @author Anika Henke */ -/* for detecting media queries in JavaScript (see script.js): */ -#screen__mode { - position: relative; - z-index: 0; +body { + min-height: 0; /* for detecting media queries in JavaScript (see script.js): */ } /* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { -#screen__mode { - z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ +body { + min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */ } /* structure */ @@ -117,12 +115,9 @@ ********************************************************************/ @media only screen and (max-width: 480px) { -#screen__mode { - z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ -} - body { font-size: 100%; + min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */ } /*____________ structure ____________*/ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 6b1e95d62..2406a206b 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,7 +91,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
-
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 3ed8dbabe..ec6e5285e 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here - var screen_mode = jQuery('#screen__mode').css('z-index'); + var screen_mode = jQuery('body').css('min-height'); // determine our device pattern // TODO: consider moving into dokuwiki core switch (screen_mode) { - case '1': + case '1px': if (device_class.match(/tablet/)) return; device_class = 'mobile tablet'; break; - case '2': + case '2px': if (device_class.match(/phone/)) return; device_class = 'mobile phone'; break; -- cgit v1.2.3 From 86ca15261461b6c74f66407e7ac6992baa097d0d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 26 Sep 2012 09:22:02 +0100 Subject: Revert "removed html dependency from media query detection JS in new template" ... because it made the solution less transparent, more error prone and even more like a hack than it already was This reverts commit 20391a36885910a616110df30f3ce30f8d23639d. --- lib/tpl/dokuwiki/css/mobile.css | 15 ++++++++++----- lib/tpl/dokuwiki/main.php | 1 + lib/tpl/dokuwiki/script.js | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index ea32fb11d..cc61ab06c 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,16 +5,18 @@ * @author Anika Henke */ -body { - min-height: 0; /* for detecting media queries in JavaScript (see script.js): */ +/* for detecting media queries in JavaScript (see script.js): */ +#screen__mode { + position: relative; + z-index: 0; } /* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { -body { - min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */ +#screen__mode { + z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ } /* structure */ @@ -115,9 +117,12 @@ body { ********************************************************************/ @media only screen and (max-width: 480px) { +#screen__mode { + z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ +} + body { font-size: 100%; - min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */ } /*____________ structure ____________*/ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 2406a206b..6b1e95d62 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
+
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index ec6e5285e..3ed8dbabe 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here - var screen_mode = jQuery('body').css('min-height'); + var screen_mode = jQuery('#screen__mode').css('z-index'); // determine our device pattern // TODO: consider moving into dokuwiki core switch (screen_mode) { - case '1px': + case '1': if (device_class.match(/tablet/)) return; device_class = 'mobile tablet'; break; - case '2px': + case '2': if (device_class.match(/phone/)) return; device_class = 'mobile phone'; break; -- cgit v1.2.3 From 89a539f258c3cc00e6ed028bf3e0534f072b35bd Mon Sep 17 00:00:00 2001 From: Nick Reilingh Date: Sun, 30 Sep 2012 18:23:45 -0400 Subject: Changed XHTML validator icon to HTML5 (FS#2619) --- lib/tpl/dokuwiki/images/button-html5.png | Bin 0 -> 354 bytes lib/tpl/dokuwiki/images/button-xhtml.png | Bin 321 -> 0 bytes lib/tpl/dokuwiki/tpl_footer.php | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/button-html5.png delete mode 100644 lib/tpl/dokuwiki/images/button-xhtml.png (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/images/button-html5.png b/lib/tpl/dokuwiki/images/button-html5.png new file mode 100644 index 000000000..5885a331b Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-html5.png differ diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png deleted file mode 100644 index ec686442c..000000000 Binary files a/lib/tpl/dokuwiki/images/button-xhtml.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index 3a2e3d121..b7dc9c631 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -20,8 +20,8 @@ if (!defined('DOKU_INC')) die(); src="images/button-donate.gif" width="80" height="15" alt="Donate" /> >Powered by PHP - >Valid XHTML 1.0 + >Valid HTML5 >Valid CSS > Date: Sat, 6 Oct 2012 13:42:03 +0100 Subject: Removed tpl_sidebar() to avoid fatal errors in other templates Replaced it by the old tpl_include_page() and made it more flexible by adding a boolean $propagate parameter. (It's false by default for backwards compatibility reasons. Should it rather be true? That would probably be what most users want.) --- lib/tpl/dokuwiki/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 6b1e95d62..820dd47df 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
- +
-- cgit v1.2.3 From 85159e75b55f6a10010af360b6ebf9f952994511 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 02:55:37 +0100 Subject: removed stray closing div (FS#2633) --- lib/tpl/dokuwiki/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 820dd47df..963750a1c 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,7 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
-
+
-- cgit v1.2.3 From 0e6f9f08b1c948f45d1867346a4502021afa55bc Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 15:30:38 +0100 Subject: added support for local style.ini files --- lib/tpl/dokuwiki/style.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 242b43080..bcb5a1a2e 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,6 +1,9 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; Please only make changes in style.local.ini. If it doesn't exist, +; just create it by copying style.ini. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and all are supported. -- cgit v1.2.3 From 9f6bf6d3f6b79437d248bbed29bad0f69afe8660 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 7 Oct 2012 20:47:18 +0200 Subject: adjusted h1 size in sidebar note: we recommend to NOT use H1 elements in the sidebar for semantic reasons --- lib/tpl/dokuwiki/css/design.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 12ec80687..67fe7ac13 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -264,6 +264,7 @@ /* make sidebar more condensed */ #dokuwiki__aside h1 { + font-size: 1.7em; margin-bottom: .222em; } #dokuwiki__aside h2 { -- cgit v1.2.3 From f3f24c6857f888109f23be1ab8dcf45df25b2ca5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 23:03:03 +0100 Subject: improvements to h1 in sidebar (follow font size scale + vertical grid) --- lib/tpl/dokuwiki/css/design.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 67fe7ac13..5cf7fad42 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -264,8 +264,8 @@ /* make sidebar more condensed */ #dokuwiki__aside h1 { - font-size: 1.7em; - margin-bottom: .222em; + font-size: 1.714em; + margin-bottom: .292em; } #dokuwiki__aside h2 { margin-bottom: .333em; -- cgit v1.2.3 From 650d96f6b66b6c10cb0f2e51a75def685e8fb2d3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 23:58:42 +0100 Subject: fixed 2-digit ordered list items in sidebar (FS#2624) --- lib/tpl/dokuwiki/css/design.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 5cf7fad42..501e0a613 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -295,15 +295,16 @@ #dokuwiki__aside ul, #dokuwiki__aside ol { - padding-left: 0; + padding-left: .5em; } [dir=rtl] #dokuwiki__aside ul, [dir=rtl] #dokuwiki__aside ol { - padding-right: 0; + padding-right: .5em; } #dokuwiki__aside li ul, #dokuwiki__aside li ol { margin-bottom: 0; + padding: 0; } #dokuwiki__aside a:link, -- cgit v1.2.3 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/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 +++--- 13 files changed, 29 insertions(+), 20 deletions(-) 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 (limited to 'lib/tpl/dokuwiki') 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 From 0ac69508958a06e566a51fb6a74802401ebe5eb5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 11 Oct 2012 13:26:47 +0100 Subject: changed local style.ini to be merged with standard one --- lib/tpl/dokuwiki/style.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index bcb5a1a2e..86066fa3b 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,8 +1,10 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here -; Please only make changes in style.local.ini. If it doesn't exist, -; just create it by copying style.ini. +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently -- cgit v1.2.3 From 870c8a4b77dd7c2cfdc14045f8604b5bbf34c01e Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 12 Oct 2012 00:41:37 +0100 Subject: #2541, alter section highlighting to insert a container into the DOM to hold the elements being highlighted & later remove it --- lib/tpl/dokuwiki/css/_edit.css | 6 ++++-- lib/tpl/dokuwiki/css/design.css | 6 ++++-- lib/tpl/dokuwiki/css/mobile.css | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index e4182774e..bae69ad96 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -140,8 +140,10 @@ div.picker button.toolbutton { } /* style for section highlighting (only sections below headings) */ .dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ - padding: 3em .5em .01em .5em; + margin-left: -1em; /* negative side margin = side padding + side border */ + margin-right: -1em; /* negative side margin = side padding + side border */ + padding-left: .5em; + padding-right: .5em; border: solid __background_alt__; border-width: 0 .5em; } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 501e0a613..87610663d 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -421,8 +421,10 @@ } .dokuwiki div.section_highlight { - margin: -3em -2em -.01em -2em; - padding: 3em 1em .01em 1em; + margin-left: -2em; + margin-right: -2em; + padding-left: 1em; + padding-right: 1em; border-width: 0 1em; } [dir=rtl] .dokuwiki div.section_highlight { diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index cc61ab06c..7f106b046 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -92,8 +92,10 @@ /* _edit */ .dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; - padding: 3em .5em .01em .5em; + margin-left: -1em; + margin-right: -1em; + padding-left: .5em; + padding-right: .5em; border-width: 0 .5em; } .dokuwiki div.preview { -- cgit v1.2.3 From db770f698b9d190dce389ce0a29b84eaa333dff8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 15:41:25 +0100 Subject: fixed typo in style.ini --- lib/tpl/dokuwiki/style.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 1402f751a..d5cc68852 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -3,7 +3,7 @@ ; To extend this file or make changes to it, it is recommended to create ; a style.local.ini file to prevent losing any changes after an upgrade. -; Please don't forgot to copy the section your changes should be under +; Please don't forget to copy the section your changes should be under ; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value -- cgit v1.2.3 From 1586bc3488e4f51d3ce69662f9be7fce5c4f7673 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 20:08:52 +0100 Subject: improved tab styles * added more selectors to allow different markup * added border to make tabs more distinctive, especially in other templates --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 25 ++++++++++++---- lib/tpl/dokuwiki/css/_tabs.css | 47 ++++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 15 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index c67e16051..8d5e1e8ca 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -91,24 +91,35 @@ text-align: right; } +/* make it look like a tab (as in _tabs.css) */ #mediamanager__page .namespaces h2 { font-size: 1em; display: inline-block; - border-width: 0; padding: .3em .8em; - margin: 0 .3em 0 0; + margin: 0 0 0 .3em; border-radius: .5em .5em 0 0; font-weight: normal; background-color: __background_alt__; color: __text__; + border: 1px solid __border__; + border-bottom-color: __background_alt__; line-height: 1.4em; + position: relative; + bottom: -1px; + z-index: 2; } * html #mediamanager__page .namespaces h2, *+html #mediamanager__page .namespaces h2 { display: inline; } [dir=rtl] #mediamanager__page .namespaces h2 { - margin-right: 10px; + margin: 0 .3em 0 0; + position: relative; + right: 10px; +} +#mediamanager__page .namespaces .panelHeader { + border-top: 1px solid __border__; + z-index: 1; } #mediamanager__page .namespaces ul { @@ -165,10 +176,12 @@ #mediamanager__page .panelHeader ul li.listType { padding-left: 30px; + margin: 0 0 0 5px; background: url('../../images/icon-list.png') 3px 1px no-repeat; } #mediamanager__page .panelHeader ul li.sortBy { padding-left: 30px; + margin: 0 0 0 5px; background: url('../../images/icon-sort.png') 3px 1px no-repeat; } @@ -185,10 +198,10 @@ #mediamanager__page .filelist ul { padding: 0; - margin: 0; + margin: 0 10px 0 0; } -[dir=rtl] #mediamanager__page .filelist ul.tabs { - margin-right: 10px; +[dir=rtl] #mediamanager__page .filelist ul { + margin: 0 10px 0 0; } #mediamanager__page .filelist .panelContent ul li:hover { diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css index 1dffa8f7b..845ec9a57 100644 --- a/lib/tpl/dokuwiki/css/_tabs.css +++ b/lib/tpl/dokuwiki/css/_tabs.css @@ -2,40 +2,56 @@ * This file provides the styles for general tabs. */ +.dokuwiki .tabs > ul, .dokuwiki ul.tabs { padding: 0; margin: 0; overflow: hidden; + position: relative; } +/* border underneath */ +.dokuwiki .tabs > ul:after, +.dokuwiki ul.tabs:after { + position: absolute; + content: ""; + width: 100%; + bottom: 0; + left: 0; + border-bottom: 1px solid __border__; + z-index: 1; +} + +.dokuwiki .tabs > ul li, .dokuwiki ul.tabs li { float: left; padding: 0; margin: 0; list-style: none; } +[dir=rtl] .dokuwiki .tabs > ul li, [dir=rtl] .dokuwiki ul.tabs li { float: right; } +.dokuwiki .tabs > ul li a, .dokuwiki ul.tabs li strong, .dokuwiki ul.tabs li a { - float: left; + display: inline-block; padding: .3em .8em; - margin: 0 .3em 0 0; + margin: 0 0 0 .3em; background-color: __background_neu__; color: __text__; + border: 1px solid __border__; border-radius: .5em .5em 0 0; + position: relative; + z-index: 0; } +[dir=rtl] .dokuwiki .tabs > ul li a, [dir=rtl] .dokuwiki ul.tabs li strong, [dir=rtl] .dokuwiki ul.tabs li a { - float: right; - margin: 0 0 0 .3em; -} -*+html[dir=rtl] .dokuwiki ul.tabs li strong, -*+html[dir=rtl] .dokuwiki ul.tabs li a { - float: none; - display: inline-block; + margin: 0 .3em 0 0; } + .dokuwiki ul.tabs li strong { font-weight: normal; } @@ -43,6 +59,11 @@ .dokuwiki ul.tabs li a:link, .dokuwiki ul.tabs li a:visited { } +.dokuwiki .tabs > ul li a:hover, +.dokuwiki .tabs > ul li a:active, +.dokuwiki .tabs > ul li a:focus, +.dokuwiki .tabs > ul li .curid a, +.dokuwiki .tabs > ul .active a, .dokuwiki ul.tabs li a:hover, .dokuwiki ul.tabs li a:active, .dokuwiki ul.tabs li a:focus, @@ -50,4 +71,12 @@ background-color: __background_alt__; color: __text__; text-decoration: none; + font-weight: normal; +} + +.dokuwiki .tabs > ul li .curid a, +.dokuwiki .tabs > ul li .active a, +.dokuwiki ul.tabs li strong { + z-index: 2; + border-bottom-color: __background_alt__; } -- cgit v1.2.3 From 0c49c5d6c2b38fdcf269e570dd7948632d3b23ff Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 22:52:07 +0100 Subject: moved some styles around --- lib/tpl/dokuwiki/css/basic.css | 73 ++++++------ lib/tpl/dokuwiki/css/content.css | 227 +++++++++++++++++++++++++++++++++---- lib/tpl/dokuwiki/css/design.css | 206 --------------------------------- lib/tpl/dokuwiki/template.info.txt | 4 +- 4 files changed, 243 insertions(+), 267 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 55c1d2dfe..539ccd715 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -43,6 +43,16 @@ legend { line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ } +[dir=rtl] h1, +[dir=rtl] h2, +[dir=rtl] h3, +[dir=rtl] h4, +[dir=rtl] h5, +[dir=rtl] h6, +[dir=rtl] caption, +[dir=rtl] legend { + clear: right; +} h1 { font-size: 2em; @@ -99,11 +109,20 @@ ul, ol { padding: 0 0 0 1.5em; } +[dir=rtl] ul, +[dir=rtl] ol { + padding: 0 1.5em 0 0; +} + li, dd { padding: 0; margin: 0 0 0 1.5em; } +[dir=rtl] li, +[dir=rtl] dd { + margin: 0 1.5em 0 0; +} dt { font-weight: bold; margin: 0; @@ -145,6 +164,9 @@ caption { text-align: left; margin: 0 0 .3em; } +[dir=rtl] caption { + text-align: right; +} th, td { @@ -158,6 +180,10 @@ th { font-weight: bold; background-color: __background_alt__; } +[dir=rtl] td, +[dir=rtl] th { + text-align: right; +} /*____________ links ____________*/ @@ -225,10 +251,14 @@ kbd { font-size: 1em; direction: ltr; text-align: left; + background-color: __background_alt__; + color: __text__; } pre { overflow: auto; word-wrap: normal; + border: 1px solid __border__; + padding: .7em 1em; } blockquote { @@ -236,6 +266,9 @@ blockquote { border: solid __border__; border-width: 0 0 0 .25em; } +[dir=rtl] blockquote { + border-width: 0 .25em 0 0; +} q:before, q:after { content: ''; @@ -343,6 +376,10 @@ button, padding: .1em .5em; cursor: pointer; } +#IE7 input.button, +#IE7 button { + line-height: 1.4; +} input[type=submit]:hover, input[type=submit]:active, @@ -379,39 +416,3 @@ input[readonly], button[readonly] { cursor: auto; } - -/*____________ rtl corrections ____________*/ - -[dir=rtl] caption, -[dir=rtl] td, -[dir=rtl] th { - text-align: right; -} - -[dir=rtl] ul, -[dir=rtl] ol { - padding: 0 1.5em 0 0; -} -[dir=rtl] li, -[dir=rtl] dd { - margin: 0 1.5em 0 0; -} -[dir=rtl] blockquote { - border-width: 0 .25em 0 0; -} - -[dir=rtl] h1, -[dir=rtl] h2, -[dir=rtl] h3, -[dir=rtl] h4, -[dir=rtl] h5, -[dir=rtl] h6, -[dir=rtl] caption, -[dir=rtl] legend { - clear: right; -} - -[dir=rtl] .a11y { - left: auto; - right: -9000px; -} diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 1d3ae8c01..aae83570d 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -82,6 +82,7 @@ /*____________ tables ____________*/ +/* div around each table */ .dokuwiki div.table { overflow-x: auto; margin-bottom: 1.4em; @@ -92,17 +93,6 @@ .dokuwiki table.inline { min-width: 50%; - border-width: 0; -} -.dokuwiki table.inline th, -.dokuwiki table.inline td { - border: 1px solid __border__; -} -.dokuwiki table.inline th { - color: inherit; - background-color: __background_alt__; -} -.dokuwiki table.inline td { } .dokuwiki table.inline tr:hover td { background-color: __background_alt__; @@ -114,22 +104,11 @@ /*____________ code ____________*/ -.dokuwiki pre, -.dokuwiki tt, -.dokuwiki code, -.dokuwiki samp, -.dokuwiki kbd { - background-color: __background_alt__; - color: __text__; -} /* fix if background-color hides underlining */ .dokuwiki em.u code { text-decoration: underline; } -.dokuwiki pre { - border: 1px solid __border__; - padding: .75em 1em; -} + /* for code in */ .dokuwiki pre.file { } @@ -175,3 +154,205 @@ clear: left; } + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + box-shadow: .1em .1em .1em __border__; + border-radius: 2px; + padding: .3em .5em; + font-size: .9em; +} +.dokuwiki form.search div.ajax_qsearch { + top: -.35em; + font-size: 1em; + text-overflow: ellipsis; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} +[dir=rtl] .JSpopup ul, +[dir=rtl] .JSpopup ol { + padding-right: 0; +} + + +/* changes to underscored CSS files +********************************************************************/ + +#acl__tree li { + margin: 0; +} + +#dokuwiki__content span.curid a { + font-weight: normal; +} +#dokuwiki__content strong span.curid a { + font-weight: bold; +} + + +/*____________ changes to _edit ____________*/ + +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-left-width: 0; + padding: .1em .35em; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-left-width: 1px; +} +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} + +.dokuwiki div.section_highlight { + margin-left: -2em; + margin-right: -2em; + padding-left: 1em; + padding-right: 1em; + border-width: 0 1em; +} +[dir=rtl] .dokuwiki div.section_highlight { + margin-right: -2em; + border-right-width: 1em; +} + +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; +} + +.dokuwiki div.preview { + margin: 0 -2em; + padding: 0 2em; +} +.dokuwiki.hasSidebar div.preview { + border-right: __sidebar_width__ solid __background_alt__; +} +[dir=rtl] .dokuwiki.hasSidebar div.preview { + border-right-width: 0; + border-left: __sidebar_width__ solid __background_alt__; +} +.dokuwiki div.preview div.pad { + padding: 1.556em 0 2em; +} + + +/*____________ changes to _toc ____________*/ + +#dw__toc { + margin: -1.556em -2em .5em 1.4em; + width: __sidebar_width__; + border-left: 1px solid __border__; + background: __background__; + color: inherit; +} +[dir=rtl] #dw__toc { + margin: -1.556em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} + +.dokuwiki h3.toggle { + padding: .5em 1em; + margin-bottom: 0; + font-size: .875em; + letter-spacing: .1em; +} +#dokuwiki__aside h3.toggle { + display: none; +} + +.dokuwiki .toggle strong { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; +} +.dokuwiki .toggle.closed strong { + background-position: 0 -5px; +} + +.dokuwiki .toggle strong span { + display: none; +} + + +#dw__toc > div { + font-size: 0.875em; + padding: .5em 1em 1em; +} +#dw__toc ul { + padding: 0 0 0 1.2em; +} +[dir=rtl] #dw__toc ul { + padding: 0 1.5em 0 0; +} +#dw__toc ul li { + list-style-image: url(images/toc-bullet.png); +} +#dw__toc ul li.clear { + list-style: none; +} +#dw__toc ul li div.li { + padding: .2em 0; +} + + +/*____________ changes to _imgdetail ____________*/ + +#dokuwiki__detail { + padding: 0; +} +#dokuwiki__detail img { + float: none; + margin-bottom: 1.4em; +} +#dokuwiki__detail div.img_detail { + float: none; +} + +#dokuwiki__detail div.img_detail dl { + overflow: hidden; +} +#dokuwiki__detail div.img_detail dl dt { + float: left; + width: 9em; + text-align: right; + clear: left; +} +[dir=rtl] #dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 9.5em; +} +[dir=rtl] #dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 87610663d..2c2109228 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -364,217 +364,11 @@ text-align: left; } -/*____________ misc ____________*/ - /* license note under edit window */ .dokuwiki div.license { font-size: 93.75%; } -#IE7 .dokuwiki input.button, -#IE7 .dokuwiki button { - line-height: 1.4; -} - -#acl__tree li { - margin: 0; -} - -#dokuwiki__content span.curid a { - font-weight: normal; -} -#dokuwiki__content strong span.curid a { - font-weight: bold; -} - - -/*____________ changes to _edit ____________*/ - -.dokuwiki div.toolbar button.toolbutton { - border-radius: 0; - border-left-width: 0; - padding: .1em .35em; -} -.dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-left-width: 1px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-left-width: 0; - border-right-width: 1px; -} -.dokuwiki div.toolbar button.toolbutton:last-child { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-left-width: 1px; -} - -.dokuwiki div.section_highlight { - margin-left: -2em; - margin-right: -2em; - padding-left: 1em; - padding-right: 1em; - border-width: 0 1em; -} -[dir=rtl] .dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} - -.dokuwiki textarea.edit { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; -} - -.dokuwiki div.preview { - margin: 0 -2em; - padding: 0 2em; -} -.dokuwiki.hasSidebar div.preview { - border-right: __sidebar_width__ solid __background_alt__; -} -[dir=rtl] .dokuwiki.hasSidebar div.preview { - border-right-width: 0; - border-left: __sidebar_width__ solid __background_alt__; -} -.dokuwiki div.preview div.pad { - padding: 1.556em 0 2em; -} - - -/*____________ changes to _toc ____________*/ - -#dw__toc { - margin: -1.556em -2em .5em 1.4em; - width: __sidebar_width__; - border-left: 1px solid __border__; - background: __background__; - color: inherit; -} -[dir=rtl] #dw__toc { - margin: -1.556em 1.4em .5em -2em; - border-left-width: 0; - border-right: 1px solid __border__; -} - -.dokuwiki h3.toggle { - padding: .5em 1em; - margin-bottom: 0; - font-size: .875em; - letter-spacing: .1em; -} -#dokuwiki__aside h3.toggle { - display: none; -} - -.dokuwiki .toggle strong { - background: transparent url(images/toc-arrows.png) 0 0; - width: 8px; - height: 5px; - margin: .4em 0 0; -} -.dokuwiki .toggle.closed strong { - background-position: 0 -5px; -} - -.dokuwiki .toggle strong span { - display: none; -} - - -#dw__toc > div { - font-size: 0.875em; - padding: .5em 1em 1em; -} -#dw__toc ul { - padding: 0 0 0 1.2em; -} -[dir=rtl] #dw__toc ul { - padding: 0 1.5em 0 0; -} -#dw__toc ul li { - list-style-image: url(images/toc-bullet.png); -} -#dw__toc ul li.clear { - list-style: none; -} -#dw__toc ul li div.li { - padding: .2em 0; -} - - -/*____________ changes to _imgdetail ____________*/ - -#dokuwiki__detail { - padding: 0; -} -#dokuwiki__detail img { - float: none; - margin-bottom: 1.4em; -} -#dokuwiki__detail div.img_detail { - float: none; -} - -#dokuwiki__detail div.img_detail dl { - overflow: hidden; -} -#dokuwiki__detail div.img_detail dl dt { - float: left; - width: 9em; - text-align: right; - clear: left; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dt { - float: right; - text-align: left; - clear: right; -} -#dokuwiki__detail div.img_detail dl dd { - margin-left: 9.5em; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dd { - margin-left: 0; - margin-right: 9.5em; -} - - -/*____________ JS popup ____________*/ - -.JSpopup { - background-color: __background__; - color: __text__; - border: 1px solid __border__; - box-shadow: .1em .1em .1em __border__; - border-radius: 2px; - padding: .3em .5em; - font-size: .9em; -} -.dokuwiki form.search div.ajax_qsearch { - top: -.35em; - font-size: 1em; - text-overflow: ellipsis; -} - -.JSpopup ul, -.JSpopup ol { - padding-left: 0; -} -[dir=rtl] .JSpopup ul, -[dir=rtl] .JSpopup ol { - padding-right: 0; -} - /* footer ********************************************************************/ diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index dfac2ef4e..a9a55865e 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ -base dokuwiki +base dokuwiki author Anika Henke email anika@selfthinker.org -date 2012-09-08 +date 2012-10-12 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From 63c25974f5bb7ca4472bc68a2342ac05d42883b5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 23:31:01 +0100 Subject: removed unnecessary print styles --- lib/tpl/dokuwiki/css/print.css | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index 191d50c28..d30bc6c91 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -14,16 +14,11 @@ body { /* hide certain sections */ .a11y, -div.notify, -div.info, -div.success, -div.error, #dokuwiki__header .tools, #dokuwiki__aside, .dokuwiki .breadcrumbs, #dw__toc, h3.toggle, -.dokuwiki .secedit, #dokuwiki__pagetools, #dokuwiki__footer { display: none; @@ -57,14 +52,11 @@ h3.toggle, list-style-type: lower-roman; } -/* undo icons */ .dokuwiki a:link, .dokuwiki a:visited { text-decoration: underline; color: #333; background-color: inherit; - background-image: none; - padding: 0; } /* display href after link */ @@ -94,42 +86,12 @@ a.mail:after { } .dokuwiki img.medialeft { margin: .2em 1em .2em 0; - float: left; } .dokuwiki img.mediaright { margin: .2em 0 .2em 1em; - float: right; } .dokuwiki img.mediacenter { margin: .2em auto; - display: block; -} - -/* align table cells */ -.dokuwiki .leftalign { - text-align: left; -} -.dokuwiki .centeralign { - text-align: center; -} -.dokuwiki .rightalign { - text-align: right; -} - -/* underline */ -.dokuwiki em.u { - font-style: normal; - text-decoration: underline; -} -.dokuwiki em em.u { - font-style: italic; -} - -div.clearer { - clear: both; - line-height: 0; - height: 0; - overflow: hidden; } .dokuwiki blockquote { -- cgit v1.2.3 From 7ecda050991d21031d59eb064890acdb2ee954ae Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Oct 2012 00:06:25 +0100 Subject: improved section highlighting styles --- lib/tpl/dokuwiki/css/_edit.css | 11 +++-------- lib/tpl/dokuwiki/css/content.css | 10 ++-------- lib/tpl/dokuwiki/css/mobile.css | 6 ++---- 3 files changed, 7 insertions(+), 20 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index bae69ad96..0c66c75b7 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -135,15 +135,10 @@ div.picker button.toolbutton { font-size: 75%; } -/* generic style for section highlighting (including headings) */ -.dokuwiki .section_highlight { -} -/* style for section highlighting (only sections below headings) */ +/* style for section highlighting */ .dokuwiki div.section_highlight { - margin-left: -1em; /* negative side margin = side padding + side border */ - margin-right: -1em; /* negative side margin = side padding + side border */ - padding-left: .5em; - padding-right: .5em; + margin: 0 -1em; /* negative side margin = side padding + side border */ + padding: 0 .5em; border: solid __background_alt__; border-width: 0 .5em; } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index aae83570d..a714869db 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -230,16 +230,10 @@ } .dokuwiki div.section_highlight { - margin-left: -2em; - margin-right: -2em; - padding-left: 1em; - padding-right: 1em; + margin: 0 -2em; + padding: 0 1em; border-width: 0 1em; } -[dir=rtl] .dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} .dokuwiki textarea.edit { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 7f106b046..501e53a54 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -92,10 +92,8 @@ /* _edit */ .dokuwiki div.section_highlight { - margin-left: -1em; - margin-right: -1em; - padding-left: .5em; - padding-right: .5em; + margin: 0 -1em; + padding: 0 .5em; border-width: 0 .5em; } .dokuwiki div.preview { -- cgit v1.2.3 From 90104b138051e1fbecfc8a13f512a3794fec93c8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Oct 2012 11:33:56 +0100 Subject: beautified code blocks, also using lighter background colour (FS#2444) --- lib/tpl/dokuwiki/css/basic.css | 6 +++++- lib/tpl/dokuwiki/css/content.css | 17 +++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 539ccd715..27ca84cdf 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -251,13 +251,17 @@ kbd { font-size: 1em; direction: ltr; text-align: left; - background-color: __background_alt__; + background-color: __background_site__; color: __text__; + box-shadow: inset 0 0 .3em __border__; + border-radius: 2px; } pre { overflow: auto; word-wrap: normal; border: 1px solid __border__; + border-radius: 2px; + box-shadow: inset 0 0 .5em __border__; padding: .7em 1em; } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index a714869db..437ad7b05 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -120,15 +120,15 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { - background-color: __background_alt__; + background-color: __background_site__; /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ - background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); - background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%); + background: -o-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); + background: -ms-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); + background: linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); color: inherit; border: 1px solid __border__; - border-bottom-color: __background_alt__; + border-bottom-color: __background_site__; border-top-left-radius: .3em; border-top-right-radius: .3em; padding: .3em .6em .1em; @@ -154,6 +154,11 @@ clear: left; } +.dokuwiki dl.code pre, +.dokuwiki dl.file pre { + box-shadow: inset -4px -4px .5em -.3em __border__; +} + /*____________ JS popup ____________*/ -- cgit v1.2.3 From f98e484a45d533262ff2e9f4359dc02da66a257b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Oct 2012 12:09:40 +0100 Subject: RTL and IE7 fixes for code blocks --- lib/tpl/dokuwiki/css/basic.css | 1 - lib/tpl/dokuwiki/css/content.css | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 27ca84cdf..8b7447239 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -38,7 +38,6 @@ caption, legend { font-family: Arial, sans-serif; font-weight: bold; - background-color: inherit; padding: 0; line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 437ad7b05..c23612643 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -121,7 +121,7 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_site__; - /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ + /* background: -moz-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */ background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%); background: -o-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); background: -ms-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); @@ -137,8 +137,7 @@ } [dir=rtl] .dokuwiki dl.code dt, [dir=rtl] .dokuwiki dl.file dt { - margin-left: 0; - margin-right: 1em; + float: right; } .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { @@ -148,10 +147,16 @@ display: block; min-height: 16px; } + .dokuwiki dl.code dd, .dokuwiki dl.file dd { margin: 0; clear: left; + min-height: 1px; /* for IE7 */ +} +[dir=rtl] .dokuwiki dl.code dd, +[dir=rtl] .dokuwiki dl.file dd { + clear: right; } .dokuwiki dl.code pre, -- cgit v1.2.3 From ac628d80ed1fc2003b4f4ef6e6897d9c9235ae83 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 26 Oct 2012 00:09:31 +0100 Subject: added cut off points for mobile devices as parameters to style.ini --- lib/tpl/dokuwiki/css/mobile.css | 8 ++++---- lib/tpl/dokuwiki/style.ini | 3 +++ lib/tpl/dokuwiki/template.info.txt | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 501e53a54..88333c012 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -11,9 +11,9 @@ z-index: 0; } -/* up to 979px screen widths +/* for screen widths in the tablet range ********************************************************************/ -@media only screen and (max-width: 979px) { +@media only screen and (max-width: __tablet_width__) { #screen__mode { z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ @@ -113,9 +113,9 @@ } /* /@media */ -/* up to 480px screen widths +/* for screen widths in the smartphone range ********************************************************************/ -@media only screen and (max-width: 480px) { +@media only screen and (max-width: __phone_width__) { #screen__mode { z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index d5cc68852..67fbb3065 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -74,3 +74,6 @@ __missing__ = "#d30" ; site and sidebar widths __site_width__ = "75em" __sidebar_width__ = "16em" +; cut off points for mobile devices +__tablet_width__ = "979px" +__phone_width__ = "480px" diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index a9a55865e..d32e94d39 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 2012-10-12 +date 2012-10-26 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From 8ca91870d51c8a06a61e4ea7be859abbe6ba00e5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 14 Nov 2012 00:31:22 +0000 Subject: added another place to look for logo to make it more consistent (FS#2656) --- lib/tpl/dokuwiki/tpl_header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 0704aa271..19d165059 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -20,7 +20,7 @@ if (!defined('DOKU_INC')) die();