From 8770796f2519e41d394b3d774bc831b9315e10a8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 24 Feb 2013 19:10:48 +0000
Subject: make scrolling possible in media manager on smaller screens (FS#2723)

---
 lib/tpl/dokuwiki/css/mobile.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 88333c012..e1d4dda72 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -89,6 +89,10 @@
 .dokuwiki div.page {
     padding: 1em;
 }
+/* enable horizontal scrolling in media manager */
+.mode_media div.page {
+    overflow: auto;
+}
 
 /* _edit */
 .dokuwiki div.section_highlight {
-- 
cgit v1.2.3


From aaec90e43993614263ee747a827f0c8555698958 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 25 Feb 2013 00:42:45 +0100
Subject: Fix search button in rtl languages in Chrome

For some reason without position: relative the search button is hidden
in rtl languages.
---
 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 2c2109228..2eb357a59 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -205,6 +205,7 @@
     background-position: 5px 0;
     margin-left: 0;
     margin-right: -20px;
+    position: relative;
 }
 
 #dokuwiki__sitetools ul {
-- 
cgit v1.2.3


From 058fd09655df42c72f3c447e3b9561e4909e978d Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 25 Feb 2013 00:45:46 +0100
Subject: Fix current mode icons in rtl languages

---
 lib/tpl/dokuwiki/css/pagetools.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index 60dc43fb1..0c31e283f 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -222,7 +222,7 @@
 [dir=rtl] #dokuwiki__pagetools ul li a.revs:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.revs:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.revs:focus,
-.mode_revisions [dir=rtl] #dokuwiki__pagetools ul li a.revs {
+[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
     background-position: left -585px;
 }
 
@@ -241,7 +241,7 @@
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus,
-.mode_backlink [dir=rtl] #dokuwiki__pagetools ul li a.backlink {
+[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
     background-position: left -675px;
 }
 
@@ -277,7 +277,7 @@
 [dir=rtl] #dokuwiki__pagetools ul li a.revert:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.revert:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.revert:focus,
-.mode_revert [dir=rtl] #dokuwiki__pagetools ul li a.revert {
+[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
     background-position: left -495px;
 }
 
@@ -296,7 +296,7 @@
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover,
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active,
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus,
-.mode_subscribe [dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
+[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
     background-position: left -765px;
 }
 
-- 
cgit v1.2.3


From c97b0f20e860cdd8e4dbb72b14ca1588ec7abda1 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 25 Feb 2013 00:55:01 +0100
Subject: Fix pagetools display without images FS#2634

This makes the pagetools in non-hover/static/active-mode use another
image replacement technique that falls back to the text when images are
disabled. Furthermore this fixes the :focused-display in IE7 by using
:active, too.
---
 lib/tpl/dokuwiki/css/pagetools.css | 97 ++++++++++++++++++++++++++++++++------
 1 file changed, 82 insertions(+), 15 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index 0c31e283f..41f876d48 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -72,43 +72,65 @@
     display: block;
     min-height: 20px; /* 30 - 2x5 */
     line-height: 20px;
-    padding: 5px 40px 5px 5px;
-    background-image: url(images/pagetools-sprite.png);
+    padding: 0;
     background-position: right 0;
     background-repeat: no-repeat;
     /* add transparent border to prevent jumping when proper border is added on focus */
     border: 1px solid transparent;
     white-space: nowrap;
+    width: 30px;
+    height: 30px;
+    overflow: hidden;
+    margin-left: auto; /* align right if the ul is larger because one item is focused */
 }
-[dir=rtl] #dokuwiki__pagetools ul li a {
-    padding: 5px 5px 5px 40px;
-    background-position: left 0;
+
+#dokuwiki__pagetools ul li a:before {
+    content: url(images/pagetools-sprite.png);
+    display: inline-block;
+    font-size: 0;
+    line-height: 0;
 }
 
-/* hide labels accessibly when neither on hover nor on focus */
-#dokuwiki__pagetools ul li a span {
-    position: absolute;
-    clip: rect(0 0 0 0); /* IE7, IE6 */
-    clip: rect(0, 0, 0, 0);
+[dir=rtl] #dokuwiki__pagetools ul li a {
+    background-position: left 0;
+    margin-right: auto;
+    margin-left: 0;
 }
 
 /* show all tools on hover and individual tools on focus */
 #dokuwiki__pagetools:hover ul,
-#dokuwiki__pagetools ul li a:focus {
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
     background-color: __background__;
     border-color: __border__;
     border-radius: 2px;
     box-shadow: 2px 2px 2px __text_alt__;
 }
+
+#dokuwiki__pagetools:hover ul li a,
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
+    width: auto;
+    height: auto;
+    overflow: visible;
+    padding: 5px 40px 5px 5px;
+    background-image: url(images/pagetools-sprite.png);
+}
+
+#dokuwiki__pagetools:hover ul li a:before,
+#dokuwiki__pagetools ul li a:focus:before {
+    content: none;
+}
+
 [dir=rtl] #dokuwiki__pagetools:hover ul,
 [dir=rtl] #dokuwiki__pagetools ul li a:focus {
     box-shadow: -2px 2px 2px __text_alt__;
 }
 
-#dokuwiki__pagetools:hover ul li a span,
-#dokuwiki__pagetools ul li a:focus span {
-    display: inline;
-    position: static;
+[dir=rtl] #dokuwiki__pagetools:hover li a,
+[dir=rtl] #dokuwiki__pagetools ul li a:focus,
+[dir=rtl] #dokuwiki__pagetools ul li a:active {
+    padding: 5px 5px 5px 40px;
 }
 
 #dokuwiki__pagetools ul li a:hover,
@@ -139,6 +161,9 @@
     background-position: left -45px;
 }
 
+#dokuwiki__pagetools ul li a.create:before {
+    margin-top: -90px;
+}
 #dokuwiki__pagetools ul li a.create {
     background-position: right -90px;
 }
@@ -159,6 +184,9 @@
 #dokuwiki__pagetools ul li a.show {
     background-position: right -270px;
 }
+#dokuwiki__pagetools ul li a.show:before {
+    margin-top: -270px;
+}
 #dokuwiki__pagetools ul li a.show:hover,
 #dokuwiki__pagetools ul li a.show:active,
 #dokuwiki__pagetools ul li a.show:focus {
@@ -176,6 +204,9 @@
 #dokuwiki__pagetools ul li a.source {
     background-position: right -360px;
 }
+#dokuwiki__pagetools ul li a.source:before {
+    margin-top: -360px;
+}
 #dokuwiki__pagetools ul li a.source:hover,
 #dokuwiki__pagetools ul li a.source:active,
 #dokuwiki__pagetools ul li a.source:focus {
@@ -193,6 +224,9 @@
 #dokuwiki__pagetools ul li a.draft {
     background-position: right -180px;
 }
+#dokuwiki__pagetools ul li a.draft:before {
+    margin-top: -180px;
+}
 #dokuwiki__pagetools ul li a.draft:hover,
 #dokuwiki__pagetools ul li a.draft:active,
 #dokuwiki__pagetools ul li a.draft:focus {
@@ -210,12 +244,18 @@
 #dokuwiki__pagetools ul li a.revs {
     background-position: right -540px;
 }
+#dokuwiki__pagetools ul li a.revs:before {
+    margin-top: -540px;
+}
 #dokuwiki__pagetools ul li a.revs:hover,
 #dokuwiki__pagetools ul li a.revs:active,
 #dokuwiki__pagetools ul li a.revs:focus,
 .mode_revisions #dokuwiki__pagetools ul li a.revs {
     background-position: right -585px;
 }
+.mode_revisions #dokuwiki__pagetools ul li a.revs:before {
+    margin-top: -585px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.revs {
     background-position: left -540px;
 }
@@ -229,12 +269,18 @@
 #dokuwiki__pagetools ul li a.backlink {
     background-position: right -630px;
 }
+#dokuwiki__pagetools ul li a.backlink:before {
+    margin-top: -630px;
+}
 #dokuwiki__pagetools ul li a.backlink:hover,
 #dokuwiki__pagetools ul li a.backlink:active,
 #dokuwiki__pagetools ul li a.backlink:focus,
 .mode_backlink #dokuwiki__pagetools ul li a.backlink {
     background-position: right -675px;
 }
+.mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
+    margin-top: -675px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.backlink {
     background-position: left -630px;
 }
@@ -248,6 +294,9 @@
 #dokuwiki__pagetools ul li a.top {
     background-position: right -810px;
 }
+#dokuwiki__pagetools ul li a.top:before{
+    margin-top: -810px;
+}
 #dokuwiki__pagetools ul li a.top:hover,
 #dokuwiki__pagetools ul li a.top:active,
 #dokuwiki__pagetools ul li a.top:focus {
@@ -265,12 +314,18 @@
 #dokuwiki__pagetools ul li a.revert {
     background-position: right -450px;
 }
+#dokuwiki__pagetools ul li a.revert:before {
+    margin-top: -450px;
+}
 #dokuwiki__pagetools ul li a.revert:hover,
 #dokuwiki__pagetools ul li a.revert:active,
 #dokuwiki__pagetools ul li a.revert:focus,
 .mode_revert #dokuwiki__pagetools ul li a.revert {
     background-position: right -495px;
 }
+.mode_revert #dokuwiki__pagetools ul li a.revert:before {
+    margin-top: -450px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.revert {
     background-position: left -450px;
 }
@@ -284,12 +339,18 @@
 #dokuwiki__pagetools ul li a.subscribe {
     background-position: right -720px;
 }
+#dokuwiki__pagetools ul li a.subscribe:before {
+    margin-top: -720px;
+}
 #dokuwiki__pagetools ul li a.subscribe:hover,
 #dokuwiki__pagetools ul li a.subscribe:active,
 #dokuwiki__pagetools ul li a.subscribe:focus,
 .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
     background-position: right -765px;
 }
+.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
+    margin-top: -765px;
+}
 [dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
     background-position: left -720px;
 }
@@ -303,6 +364,9 @@
 #dokuwiki__pagetools ul li a.mediaManager {
     background-position: right -900px;
 }
+#dokuwiki__pagetools ul li a.mediaManager:before {
+    margin-top: -900px;
+}
 #dokuwiki__pagetools ul li a.mediaManager:hover,
 #dokuwiki__pagetools ul li a.mediaManager:active,
 #dokuwiki__pagetools ul li a.mediaManager:focus {
@@ -320,6 +384,9 @@
 #dokuwiki__pagetools ul li a.back {
     background-position: right -990px;
 }
+#dokuwiki__pagetools ul li a.back {
+    margin-top: -990px;
+}
 #dokuwiki__pagetools ul li a.back:hover,
 #dokuwiki__pagetools ul li a.back:active,
 #dokuwiki__pagetools ul li a.back:focus {
-- 
cgit v1.2.3


From 96e1f756daa0ff09e8a68c74a6fc4f606a723f77 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 25 Feb 2013 00:56:37 +0100
Subject: Use "old" image replacement for pagetools in IE7

This fixes the image display in IE7 with the disadvantage that now in
IE7 with images disabled the text won't be displayed anymore.
---
 lib/tpl/dokuwiki/css/pagetools.css | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
index 41f876d48..21e5c13ec 100644
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ b/lib/tpl/dokuwiki/css/pagetools.css
@@ -133,6 +133,25 @@
     padding: 5px 5px 5px 40px;
 }
 
+/* IE7 fixes, doesn't work without images */
+
+#IE7 #dokuwiki__pagetools ul li a {
+    background-image: url(images/pagetools-sprite.png);
+}
+
+#IE7 #dokuwiki__pagetools:hover ul li a span,
+#IE7 #dokuwiki__pagetools ul li a:focus span,
+#IE7 #dokuwiki__pagetools ul li a:active span {
+    clip: auto;
+    display: inline;
+    position: static;
+}
+
+#IE7 #dokuwiki__pagetools ul li a span {
+    clip: rect(0 0 0 0);
+    position: absolute;
+}
+
 #dokuwiki__pagetools ul li a:hover,
 #dokuwiki__pagetools ul li a:active,
 #dokuwiki__pagetools ul li a:focus {
-- 
cgit v1.2.3


From 3b5b1d9d6524d89f50b1825e8067cc28133358f8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
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/dokuwiki')

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 <anika@selfthinker.org>
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/dokuwiki')

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 <anika@selfthinker.org>
Date: Mon, 6 May 2013 12:25:27 +0100
Subject: updated dates in templates' and plugins' info.txt files

---
 lib/tpl/dokuwiki/template.info.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki')

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 <eckelmann@cosmocode.de>
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/dokuwiki')

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 <eckelmann@cosmocode.de>
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/dokuwiki')

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 <anika@selfthinker.org>
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/dokuwiki')

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');
 
 ?><!DOCTYPE html>
 <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 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']) ?>]</title>
     <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
     <?php tpl_metaheaders() ?>
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');
 
 ?><!DOCTYPE html>
 <html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup no-js">
 <head>
     <meta charset="utf-8" />
-    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
     <title>
         <?php echo hsc($lang['mediaselect'])?>
         [<?php echo strip_tags($conf['title'])?>]
-- 
cgit v1.2.3


From 22c5d8b475ffef3674a95847a6f2bcbf759c42e6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Jul 2013 00:08:14 +0100
Subject: fixed picker buttons not showing in IE8 and below

---
 lib/tpl/dokuwiki/css/basic.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index a0a60d295..ad04f7c41 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -227,7 +227,8 @@ audio {
     max-width: 100%;
 }
 #IE7 img,
-#IE8 img {
+#IE8 img,
+button img {
     max-width: none;
 }
 
-- 
cgit v1.2.3


From 9b136f13f2219fd6d292ab3064122bec0ec33d0d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 28 Jul 2013 13:48:36 +0100
Subject: fixed typo in commented section indenting css

---
 lib/tpl/dokuwiki/css/content.css | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/tpl/dokuwiki')

diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 119859e38..b1498d4de 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -8,16 +8,16 @@
 
 /*____________ section indenting ____________
 
-.dokuwiki.page  h1 {margin-left: 0;}
-.dokuwiki.page  h2 {margin-left: .666em;}
-.dokuwiki.page  h3 {margin-left: 1.776em;}
-.dokuwiki.page  h4 {margin-left: 3em;}
-.dokuwiki.page  h5 {margin-left: 4.5712em;}
-.dokuwiki.page  div.level1 {margin-left: 0;}
-.dokuwiki.page  div.level2 {margin-left: 1em;}
-.dokuwiki.page  div.level3 {margin-left: 2em;}
-.dokuwiki.page  div.level4 {margin-left: 3em;}
-.dokuwiki.page  div.level5 {margin-left: 4em;}
+.dokuwiki .page  h1 {margin-left: 0;}
+.dokuwiki .page  h2 {margin-left: .666em;}
+.dokuwiki .page  h3 {margin-left: 1.776em;}
+.dokuwiki .page  h4 {margin-left: 3em;}
+.dokuwiki .page  h5 {margin-left: 4.5712em;}
+.dokuwiki .page  div.level1 {margin-left: 0;}
+.dokuwiki .page  div.level2 {margin-left: 1em;}
+.dokuwiki .page  div.level3 {margin-left: 2em;}
+.dokuwiki .page  div.level4 {margin-left: 3em;}
+.dokuwiki .page  div.level5 {margin-left: 4em;}
 
 [dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;}
 [dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;}
-- 
cgit v1.2.3