Merge branch 'MDL-47972' of git://github.com/timhunt/moodle

mod/quiz/classes/output/edit_renderer.php

@@ -432,6 +432,7 @@ class edit_renderer extends \plugin_renderer_base {
         }
         $menu = new \action_menu();
         $menu->set_alignment(\action_menu::TR, \action_menu::BR);
+        $menu->set_constraint('.mod-quiz-edit-content');
         $trigger = html_writer::tag('span', get_string('add', 'quiz'), array('class' => 'add-menu'));
         $menu->set_menu_trigger($trigger);
 

mod/quiz/styles.css

@@ -913,3 +913,8 @@ table#categoryquestions {
 .questionbank .categoryselectallcontainer {
     background-color: #FFF;
 }
+
+/* Base theme needs extra support. */
+#page-mod-quiz-edit ul.slots li.section ul.section {
+    list-style: none;
+}