Merge branch 'master' into stable

6 files changed, 159 insertions, 61 deletions

diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css
index b7c82d829..bc56a37c4 100644
--- a/lib/tpl/dokuwiki/css/_diff.css
+++ b/lib/tpl/dokuwiki/css/_diff.css
@@ -73,3 +73,65 @@
     background-color: inherit;
     font-weight: bold;
 }
+
+/* diff options */
+
+.dokuwiki .diffoptions form {
+    float: left;
+}
+.dokuwiki .diffoptions p {
+    float: right;
+}
+
+/* diff nav */
+
+.dokuwiki table.diff_sidebyside td.diffnav {
+    padding-bottom: .7em;
+}
+.dokuwiki .diffnav a {
+    display: inline-block;
+    vertical-align: middle;
+}
+.dokuwiki .diffnav a span {
+    display: none;
+}
+
+.dokuwiki .diffnav a:hover,
+.dokuwiki .diffnav a:active,
+.dokuwiki .diffnav a:focus {
+    background-color: @ini_background_alt;
+    text-decoration: none;
+}
+
+.dokuwiki .diffnav a:before {
+    display: inline-block;
+    line-height: 1;
+    padding: .2em .4em;
+    border: 1px solid @ini_border;
+    border-radius: 2px;
+    color: @ini_text;
+}
+
+.dokuwiki .diffnav a.diffprevrev:before {
+    content: '\25C0'; /* left triangle */
+}
+.dokuwiki .diffnav a.diffnextrev:before,
+.dokuwiki .diffnav a.difflastrev:before {
+    content: '\25B6'; /* right triangle */
+}
+.dokuwiki .diffnav a.diffbothprevrev:before {
+    content: '\25C0\25C0';
+}
+.dokuwiki .diffnav a.diffbothnextrev:before {
+    content: '\25B6\25B6';
+}
+
+.dokuwiki .diffnav select {
+    width: 60%;
+    min-width: 9em;
+    height: 1.5em; /* height is necessary for longer options in Webkit */
+}
+
+.dokuwiki .diffnav select option[selected] {
+    font-weight: bold;
+}
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index 5886889fd..ac9f6803a 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -101,7 +101,9 @@ address {
     padding: 0;
 }
 
-div {
+div,
+video,
+audio {
     margin: 0;
     padding: 0;
 }
@@ -453,6 +455,7 @@ input[disabled],
 button[disabled],
 select[disabled],
 textarea[disabled],
+option[disabled],
 input[readonly],
 button[readonly],
 select[readonly],
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index a5ffbf2be..a2e343a33 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -67,19 +67,19 @@
 
 /*____________ lists ____________*/
 
-#dokuwiki__content ul li,
-#dokuwiki__aside ul li {
-    color: @ini_text_alt;
-}
+.dokuwiki .page,
+.dokuwiki .aside {
+    ul li {
+        color: @ini_text_alt;
+    }
 
-#dokuwiki__content ol li,
-#dokuwiki__aside ol li {
-    color: @ini_text_neu;
-}
+    ol li {
+        color: @ini_text_neu;
+    }
 
-#dokuwiki__content li .li,
-#dokuwiki__aside li .li {
-    color: @ini_text;
+    li .li {
+        color: @ini_text;
+    }
 }
 
 /*____________ tables ____________*/
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 42292de49..66607b5e9 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -48,6 +48,12 @@
         margin-bottom: 0;
         font-size: 0.875em;
     }
+
+    /* make all links in header (including breadcrumb and interwiki) same colour as the rest */
+    a {
+        color: @ini_link;
+        background-color: inherit;
+    }
 }
 
 [dir=rtl] #dokuwiki__header h1 img {
@@ -100,7 +106,8 @@
     margin-left: 0;
 }
 
-#dokuwiki__usertools a.action {
+#dokuwiki__usertools a.action,
+#dokuwiki__usertools a.iw_user {
     padding-left: 20px;
     background: transparent url(images/usertools.png) no-repeat 0 0;
 }
@@ -137,6 +144,7 @@
         background-position: left 0;
     }
 
+    a.iw_user,
     a.action.profile {
         background-position: left -32px;
     }
@@ -186,50 +194,50 @@
     text-align: right;
 
     form.search {
-        display: block;
         font-size: 0.875em;
-        position: relative;
+    }
+}
 
-        input.edit {
-            width: 18em;
-            padding: .35em 22px .35em .1em;
-        }
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: left;
+}
 
-        input.button {
-            background: transparent url(images/search.png) no-repeat 0 0;
-            border-width: 0;
-            width: 19px;
-            height: 14px;
-            text-indent: -99999px;
-            margin-left: -20px;
-            box-shadow: none;
-            padding: 0;
-        }
+form.search {
+    display: block;
+    position: relative;
+    margin-bottom: 0.5em;
+
+    input.edit {
+        width: 18em;
+        padding: .35em 22px .35em .1em;
     }
 
-    ul {
-        margin-top: 0.5em;
+    input.button {
+        background: transparent url(images/search.png) no-repeat 0 0;
+        border-width: 0;
+        width: 19px;
+        height: 14px;
+        text-indent: -99999px;
+        margin-left: -20px;
+        box-shadow: none;
+        padding: 0;
     }
 }
 
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: left;
-
-    form.search {
-        input.edit {
-            padding: .35em .1em .35em 22px;
-        }
+[dir=rtl] form.search {
+    input.edit {
+        padding: .35em .1em .35em 22px;
+    }
 
-        input.button {
-            background-position: 5px 0;
-            margin-left: 0;
-            margin-right: -20px;
-            position: relative;
-        }
+    input.button {
+        background-position: 5px 0;
+        margin-left: 0;
+        margin-right: -20px;
+        position: relative;
     }
 }
 
-#IE7 #dokuwiki__sitetools form.search {
+#IE7 form.search {
     min-height: 1px;
     z-index: 21;
 }
@@ -260,11 +268,6 @@
         border-bottom: 1px solid @ini_border;
     }
 
-    a {
-        color: @ini_link;
-        background-color: inherit;
-    }
-
     .bcsep {
         font-size: 0.75em;
     }
@@ -278,13 +281,10 @@
 /* sidebar
 ********************************************************************/
 
-#dokuwiki__aside {
-
-    > .pad {
-        font-size: 0.875em;
-        overflow: hidden;
-        word-wrap: break-word;
-    }
+.dokuwiki .aside {
+    font-size: 0.875em;
+    overflow: hidden;
+    word-wrap: break-word;
 
     /* make sidebar more condensed */
 
@@ -340,8 +340,8 @@
     }
 }
 
-[dir=rtl] #dokuwiki__aside ul,
-[dir=rtl] #dokuwiki__aside ol {
+[dir=rtl] .dokuwiki .aside ul,
+[dir=rtl] .dokuwiki .aside ol {
     padding-right: .5em;
 }
 
diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index 289f5afa3..c3e517795 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -65,6 +65,15 @@
     margin-right: 0;
 }
 
+/* preview */
+.dokuwiki.hasSidebar div.preview {
+    border-right: none;
+}
+
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+    border-left: none;
+}
+
 /* toc */
 #dw__toc {
     float: none;
@@ -96,6 +105,15 @@
     overflow: auto;
 }
 
+/* push pagetools closer to content */
+#dokuwiki__pagetools {
+    top: 0;
+}
+.showSidebar #dokuwiki__pagetools {
+    top: 3.5em;
+}
+
+
 /* _edit */
 .dokuwiki div.section_highlight {
     margin: 0 -1em;
@@ -257,11 +275,13 @@ body {
 #config__manager td .input,
 .dokuwiki fieldset,
 .dokuwiki input.edit,
-.dokuwiki textarea,
-.dokuwiki select {
+.dokuwiki textarea {
     width: auto !important;
     max-width: 100% !important;
 }
+.dokuwiki select {
+    max-width: 100% !important;
+}
 #config__manager fieldset {
     margin-left: 0;
     margin-right: 0;
@@ -290,5 +310,17 @@ body {
 }
 
 
+} /* /@media */
+
+
+/* for screen heights smaller than the pagetools permit
+********************************************************************/
+@media only screen and (max-height: 400px) {
+// 400px is only roughly the required value, this may be wrong under non-standard circumstances
+
+#dokuwiki__pagetools div.tools {
+    position: static;
+}
+
 
 } /* /@media */
diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
index ecb3038c3..77d2670a6 100644
--- a/lib/tpl/dokuwiki/css/pagetools.less
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -231,3 +231,4 @@
 .pagetools-item(subscribe, 9, subscribe);
 .pagetools-item(mediaManager, 11);
 .pagetools-item(back, 12);
+.pagetools-item(img_backto, 12);