Merge remote-tracking branch 'origin/master' into video-audio

Conflicts:
	inc/parser/xhtml.php

4 files changed, 12 insertions, 6 deletions

diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 4d3f2b97a..522f9ed4d 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -1,4 +1,3 @@
-
 /* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */
 
 /**
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 28e347882..31b71897b 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -501,4 +501,3 @@
     width: 100%;
     max-width: none;
 }
-
diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index 1fefd68b6..20d669c14 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -154,6 +154,7 @@ html.popup {
 #media__content a.mediafile {
     margin-right: 1.5em;
     font-weight: bold;
+    cursor: pointer;
 }
 [dir=rtl] #media__content a.mediafile {
     margin-right: 0;
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index 56551fe3b..a5ffbf2be 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -113,10 +113,6 @@
     text-decoration: underline;
 }
 
-/* for code in <file> */
-.dokuwiki pre.file {
-}
-
 /* filenames for downloadable file and code blocks */
 .dokuwiki dl.code,
 .dokuwiki dl.file {
@@ -163,6 +159,17 @@
     }
 }
 
+/* for code in <file> */
+.dokuwiki dl.file {
+    pre,
+    dt {
+        border-style: dashed;
+    }
+    dt {
+        border-bottom-style: solid;
+    }
+}
+
 /*____________ JS popup ____________*/
 
 .JSpopup {