Merge branch 'MDL-83325_500' of https://github.com/timhunt/moodle into MOODLE_500_STABLE

lib/form/filemanager.php

@@ -299,7 +299,7 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element implements temp
         $html .= html_writer::empty_tag('input', array('value' => $draftitemid, 'name' => $elname, 'type' => 'hidden', 'id' => $id));
 
         if (!empty($options->accepted_types) && $options->accepted_types != '*') {
-            $html .= html_writer::tag('p', get_string('filesofthesetypes', 'form'));
+            $html .= html_writer::tag('div', get_string('filesofthesetypes', 'form'), ['class' => 'mt-1']);
             $util = new \core_form\filetypes_util();
             $filetypes = $options->accepted_types;
             $filetypedescriptions = $util->describe_file_types($filetypes);

lib/form/filepicker.php

@@ -185,7 +185,7 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input implements templat
         $html .= '</noscript>';
 
         if (!empty($args->accepted_types) && $args->accepted_types != '*') {
-            $html .= html_writer::tag('p', get_string('filesofthesetypes', 'form'));
+            $html .= html_writer::tag('div', get_string('filesofthesetypes', 'form'), ['class' => 'mt-1']);
             $util = new \core_form\filetypes_util();
             $filetypedescriptions = $util->describe_file_types($args->accepted_types);
             $html .= $OUTPUT->render_from_template('core_form/filetypes-descriptions', $filetypedescriptions);

lib/templates/filemanager_page_generallayout.mustache

@@ -27,7 +27,7 @@
     }
 }}
 <div id="filemanager-{{{client_id}}}" class="filemanager w-100 fm-loading">
-    <div class="fp-restrictions">
+    <div class="fp-restrictions mb-1">
         {{{restrictions}}}
         <span class="dnduploadnotsupported-message"> - {{#str}}dndnotsupported_insentence{{/str}}{{{helpicon}}}</span>
     </div>