From 3b5b1d9d6524d89f50b1825e8067cc28133358f8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 3 Apr 2013 00:15:45 +0100 Subject: fixed info/error messages in RTL languages --- lib/tpl/dokuwiki/css/print.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index e0eaab848..86e686b69 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -106,7 +106,7 @@ blockquote { border: solid #ccc; border-width: 0 0 0 2pt; } -[dir=rtl] .dokuwiki blockquote { +[dir=rtl] blockquote { border-width: 0 2pt 0 0; } -- cgit v1.2.3 From 4bc058637bdcf381c07dfb96502b96afa71df76a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 3 May 2013 01:04:59 +0100 Subject: fixed missing css placeholders for page container --- lib/tpl/dokuwiki/css/design.css | 6 +++--- lib/tpl/dokuwiki/css/mobile.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 2eb357a59..457414839 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -341,15 +341,15 @@ padding: .1em .35em; border-top-left-radius: 2px; border-top-right-radius: 2px; - box-shadow: 0 0 .5em #999; + box-shadow: 0 0 .5em __text_alt__; display: block; } .dokuwiki div.page { background: __background__; color: inherit; - border: 1px solid #eee; - box-shadow: 0 0 .5em #999; + border: 1px solid __background_alt__; + box-shadow: 0 0 .5em __text_alt__; border-radius: 2px; padding: 1.556em 2em 2em; margin-bottom: .5em; diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index e1d4dda72..71f80599d 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -32,7 +32,7 @@ background: __background__; color: inherit; border: 1px solid #eee; - box-shadow: 0 0 .5em #999; + box-shadow: 0 0 .5em __text_alt__; border-radius: 2px; padding: 1em; margin-bottom: .5em; -- cgit v1.2.3 From 0e748a96cda77fa0131fc0b9601de54a41592ca7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 6 May 2013 12:25:27 +0100 Subject: updated dates in templates' and plugins' info.txt files --- lib/tpl/default/template.info.txt | 2 +- lib/tpl/dokuwiki/template.info.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt index a77289e58..e0dbf54ba 100644 --- a/lib/tpl/default/template.info.txt +++ b/lib/tpl/default/template.info.txt @@ -1,7 +1,7 @@ base default author Andreas Gohr email andi@splitbrain.org -date 2012-09-08 +date 2013-02-16 name DokuWiki Default Template desc DokuWiki's default template until 2012 url http://www.dokuwiki.org/template:default diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index d32e94d39..9d062655d 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-26 +date 2013-05-02 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From 37764cbb34237da3c96bab21102e44ffe2715cd9 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Wed, 15 May 2013 10:06:23 +0200 Subject: fixed space of list points beside a floating image --- lib/tpl/dokuwiki/css/basic.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index a0a60d295..f7addc321 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -111,7 +111,7 @@ div { ul, ol { - padding: 0 0 0 1.5em; + padding: 0 0 0 0.5em; } [dir=rtl] ul, [dir=rtl] ol { @@ -146,8 +146,8 @@ li li { font-size: 100%; } -ul { list-style: square outside; } -ol { list-style: decimal outside; } +ul { list-style: square inside; } +ol { list-style: decimal inside; } ol ol { list-style-type: lower-alpha; } ol ol ol { list-style-type: upper-roman; } ol ol ol ol { list-style-type: upper-alpha; } -- cgit v1.2.3 From 712b791cc1f86484279cd54b41dfc14d0ded6fff Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Wed, 15 May 2013 12:04:02 +0200 Subject: Revert "fixed space of list points beside a floating image" This reverts commit 37764cbb34237da3c96bab21102e44ffe2715cd9. --- lib/tpl/dokuwiki/css/basic.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index f7addc321..a0a60d295 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -111,7 +111,7 @@ div { ul, ol { - padding: 0 0 0 0.5em; + padding: 0 0 0 1.5em; } [dir=rtl] ul, [dir=rtl] ol { @@ -146,8 +146,8 @@ li li { font-size: 100%; } -ul { list-style: square inside; } -ol { list-style: decimal inside; } +ul { list-style: square outside; } +ol { list-style: decimal outside; } ol ol { list-style-type: lower-alpha; } ol ol ol { list-style-type: upper-roman; } ol ol ol ol { list-style-type: upper-alpha; } -- cgit v1.2.3 From b9cf8ad44bcbbbded9d6e991f96b0d5f36310a9b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 1 Jun 2013 23:36:28 +0100 Subject: moved X-UA-Compatible from meta tag to be sent by http header instead --- lib/tpl/dokuwiki/detail.php | 2 +- lib/tpl/dokuwiki/main.php | 2 +- lib/tpl/dokuwiki/mediamanager.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index a8c5fef8a..d2ed530a3 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -9,12 +9,12 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +header('X-UA-Compatible: IE=edge,chrome=1'); ?> - <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 963750a1c..43a0c0da7 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -9,6 +9,7 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +header('X-UA-Compatible: IE=edge,chrome=1'); $hasSidebar = page_findnearest($conf['sidebar']); $showSidebar = $hasSidebar && ($ACT=='show'); @@ -16,7 +17,6 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js"> <head> <meta charset="utf-8" /> - <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index 23c9cee79..dadf2b10f 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -7,12 +7,12 @@ */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +header('X-UA-Compatible: IE=edge,chrome=1'); ?> - <?php echo hsc($lang['mediaselect'])?> [<?php echo strip_tags($conf['title'])?>] -- cgit v1.2.3