5 files changed, 25 insertions, 17 deletions
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index c8f5b7c9e..22502f6a9 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -39,12 +39,11 @@
 .dokuwiki a.interwiki {
     background-repeat: no-repeat;
     background-position: 0 center;
-    padding: 0 0 0 20px;
+    padding: 0 0 0 18px;
 }
 /* external link */
 .dokuwiki a.urlextern {
     background-image: url(images/external-link.png);
-    padding: 0 0 0 17px;
 }
 /* windows share */
 .dokuwiki a.windows {
@@ -61,7 +60,6 @@
 }
 /* interwiki link */
 .dokuwiki a.interwiki {
-    padding: 0 0 0 17px;
 }
 
 /* RTL corrections; if link icons don't work as expected, remove the following lines */
@@ -71,5 +69,5 @@
 [dir=rtl] .dokuwiki a.interwiki,
 [dir=rtl] .dokuwiki a.mediafile {
     background-position: right center;
-    padding: 0 17px 0 0;
+    padding: 0 18px 0 0;
 }
diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index eb659f12e..21bc9b25e 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -45,7 +45,7 @@ legend {
 
 h1 {
     font-size: 2em;
-    margin: -.222em 0 0.444em;
+    margin: 0 0 0.444em;
 }
 h2 {
     font-size: 1.5em;
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 4f18b79e8..d1a00ce0a 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -340,7 +340,7 @@
     border: 1px solid #eee;
     box-shadow: 0 0 .5em #999;
     border-radius: 2px;
-    padding: 2em;
+    padding: 1.556em 2em 2em;
     margin-bottom: .5em;
     overflow: hidden;
     word-wrap: break-word;
@@ -426,21 +426,31 @@
 
 .dokuwiki div.preview {
     margin: 0 -2em;
-    padding: 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:  -2em -2em .5em 1.4em;
+    margin:  -1.556em -2em .5em 1.4em;
     width: __sidebar_width__;
     border-left: 1px solid __border__;
     background: __background__;
     color: inherit;
 }
 [dir=rtl] #dw__toc {
-    margin: -2em 1.4em .5em -2em;
+    margin: -1.556em 1.4em .5em -2em;
     border-left-width: 0;
     border-right: 1px solid __border__;
 }
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 4d18113ac..5a72ed095 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -28,17 +28,17 @@
     margin-bottom: .5em;
 }
 
-.hasSidebar #dokuwiki__content {
+.showSidebar #dokuwiki__content {
     float: none;
     margin-left: 0;
     width: 100%;
 }
-.hasSidebar #dokuwiki__content > .pad {
+.showSidebar #dokuwiki__content > .pad {
     margin-left: 0;
 }
 
-[dir=rtl] .hasSidebar #dokuwiki__content,
-[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
+[dir=rtl] .showSidebar #dokuwiki__content,
+[dir=rtl] .showSidebar #dokuwiki__content > .pad {
     margin-right: 0;
 }
 
diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css
index 5e2eab3bc..00642e90b 100644
--- a/lib/tpl/dokuwiki/css/structure.css
+++ b/lib/tpl/dokuwiki/css/structure.css
@@ -56,20 +56,20 @@ body {
         margin: 0 0 0 1.5em;
     }
 
-    .hasSidebar #dokuwiki__content {
+    .showSidebar #dokuwiki__content {
         float: right;
         margin-left: -__sidebar_width__;
         width: 100%;
     }
-    [dir=rtl] .hasSidebar #dokuwiki__content {
+    [dir=rtl] .showSidebar #dokuwiki__content {
         float: left;
         margin-left: 0;
         margin-right: -__sidebar_width__;
     }
-    .hasSidebar #dokuwiki__content > .pad {
+    .showSidebar #dokuwiki__content > .pad {
         margin-left: __sidebar_width__;
     }
-    [dir=rtl] .hasSidebar #dokuwiki__content > .pad {
+    [dir=rtl] .showSidebar #dokuwiki__content > .pad {
         margin-left: 0;
         margin-right: __sidebar_width__;
     }