Merge branch 'MDL-76271-400' of https://github.com/davewoloszyn/moodle into MOODLE_400_STABLE

course/dndupload.js

@@ -565,7 +565,7 @@ M.course_dndupload = {
         resel.progressouter.appendChild(resel.progress);
         resel.div.appendChild(resel.progressouter);
 
-        modsel.insertBefore(resel.li, modsel.get('children').pop()); // Leave the 'preview element' at the bottom
+        modsel.insertBefore(resel.li, modsel.get('children')); // Leave the 'preview element' at the bottom
 
         return resel;
     },

theme/boost/scss/moodle/core.scss

@@ -1124,6 +1124,10 @@ tr.flagged-tag a {
     padding-top: 20px;
 }
 
+.activity.label.modtype_label .mod-indent {
+    float: none;
+}
+
 @include media-breakpoint-up(sm) {
     $mod-indent-size: 30px;
     /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */

theme/boost/style/moodle.css

@@ -10777,6 +10777,9 @@ tr.flagged-tag a {
   float: left;
   padding-top: 20px; }
 
+.activity.label.modtype_label .mod-indent {
+  float: none; }
+
 @media (min-width: 576px) {
   /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
   .mod-indent-1 {

theme/classic/style/moodle.css

@@ -10777,6 +10777,9 @@ tr.flagged-tag a {
   float: left;
   padding-top: 20px; }
 
+.activity.label.modtype_label .mod-indent {
+  float: none; }
+
 @media (min-width: 576px) {
   /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
   .mod-indent-1 {