From 788cf22867448a20c181f1dcc0d2acd332937cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Wed, 26 Mar 2025 16:25:20 +0100
Subject: [PATCH] MDL-85021 mod_feedback: Fix 'Edit questions' UI after BS5
 upgrade

---
 mod/feedback/classes/complete_form.php |  2 +-
 theme/boost/scss/moodle/modules.scss   |  9 ++-------
 theme/boost/style/moodle.css           | 10 ++--------
 theme/classic/style/moodle.css         | 10 ++--------
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/mod/feedback/classes/complete_form.php b/mod/feedback/classes/complete_form.php
index 3df5c1d1f5a..7e0c0c81ce7 100644
--- a/mod/feedback/classes/complete_form.php
+++ b/mod/feedback/classes/complete_form.php
@@ -479,7 +479,7 @@ class mod_feedback_complete_form extends moodleform {
         $name = html_writer::div($draghandle, 'itemhandle', ['data-drag-type' => 'move']) .
                 html_writer::div($element->getLabel(), 'itemname', ['data-region' => 'item-title']) .
                 html_writer::div($editmenu, 'itemactions');
-        $element->setLabel(html_writer::div($name, 'itemtitle d-flex'));
+        $element->setLabel(html_writer::div($name, 'itemtitle d-flex mb-3'));
     }
 
     /**
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index 8b66a9a51a2..93a41be2469 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -1595,13 +1595,8 @@ $popout-header-height: 4rem;
             }
             .itemactions {
                 position: absolute;
-                top: 0;
-                right: 0;
-                .dropdown-toggle {
-                    @include border-radius(.5rem);
-                    width: $icon-medium-width;
-                    height: $icon-medium-height;
-                }
+                top: map-get($spacers, 3);
+                right: map-get($spacers, 3);
             }
             &.sortable-list-current-position {
                 background-color: $light;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index ac4e355a38e..5475d4db0dd 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -36716,14 +36716,8 @@ img.userpicture {
 .path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .itemactions,
 .path-mod-feedback #feedback_edit_form .feedback_itemlist.sortable-list-is-dragged .itemactions {
   position: absolute;
-  top: 0;
-  right: 0;
-}
-.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .itemactions .dropdown-toggle,
-.path-mod-feedback #feedback_edit_form .feedback_itemlist.sortable-list-is-dragged .itemactions .dropdown-toggle {
-  border-radius: 0.5rem;
-  width: 40px;
-  height: 32px;
+  top: 1rem;
+  right: 1rem;
 }
 .path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist.sortable-list-current-position,
 .path-mod-feedback #feedback_edit_form .feedback_itemlist.sortable-list-is-dragged.sortable-list-current-position {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index a52cfaa5fee..e14f4048254 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -36716,14 +36716,8 @@ img.userpicture {
 .path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .itemactions,
 .path-mod-feedback #feedback_edit_form .feedback_itemlist.sortable-list-is-dragged .itemactions {
   position: absolute;
-  top: 0;
-  right: 0;
-}
-.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .itemactions .dropdown-toggle,
-.path-mod-feedback #feedback_edit_form .feedback_itemlist.sortable-list-is-dragged .itemactions .dropdown-toggle {
-  border-radius: 0.5rem;
-  width: 40px;
-  height: 32px;
+  top: 1rem;
+  right: 1rem;
 }
 .path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist.sortable-list-current-position,
 .path-mod-feedback #feedback_edit_form .feedback_itemlist.sortable-list-is-dragged.sortable-list-current-position {