From 3776d95c8fdf88d15790662a79b4e2a697e7a614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Tue, 10 Mar 2026 13:08:39 +0100
Subject: [PATCH] MDL-88148 theme_boost: Fix drawers buttons icon styles

---
 public/theme/boost/scss/moodle/layout.scss    | 7 ++-----
 public/theme/boost/style/moodle.css           | 7 ++-----
 public/theme/boost/templates/drawers.mustache | 4 ++--
 public/theme/classic/style/moodle.css         | 7 ++-----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/public/theme/boost/scss/moodle/layout.scss b/public/theme/boost/scss/moodle/layout.scss
index cc6177132d7..5700bbdc50f 100644
--- a/public/theme/boost/scss/moodle/layout.scss
+++ b/public/theme/boost/scss/moodle/layout.scss
@@ -88,13 +88,10 @@
         top: calc(#{$navbar-height} + 1rem);
         z-index: 2;
         .btn {
-            padding: 8px;
             margin: auto 16px;
             background-color: $gray-300;
-            .icon {
-                width: auto;
-                height: auto;
-            }
+            width: $icon-medium-width;
+            height: $icon-medium-width; // Using the same value for width and height to make the button square.
             &:focus {
                 box-shadow: $input-btn-focus-box-shadow;
             }
diff --git a/public/theme/boost/style/moodle.css b/public/theme/boost/style/moodle.css
index 9f9885262cc..371561955e7 100644
--- a/public/theme/boost/style/moodle.css
+++ b/public/theme/boost/style/moodle.css
@@ -39505,13 +39505,10 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
   z-index: 2;
 }
 .drawer-toggles .drawer-toggler .btn {
-  padding: 8px;
   margin: auto 16px;
   background-color: #dee2e6;
-}
-.drawer-toggles .drawer-toggler .btn .icon {
-  width: auto;
-  height: auto;
+  width: 40px;
+  height: 40px;
 }
 .drawer-toggles .drawer-toggler .btn:focus {
   box-shadow: 0 0 0 0.25rem rgba(15, 108, 191, 0.75);
diff --git a/public/theme/boost/templates/drawers.mustache b/public/theme/boost/templates/drawers.mustache
index 12a4d7dc0ed..c43aa0760a7 100644
--- a/public/theme/boost/templates/drawers.mustache
+++ b/public/theme/boost/templates/drawers.mustache
@@ -107,7 +107,7 @@
                 {{#courseindex}}
                     <div class="drawer-toggler drawer-left-toggle open-nav d-print-none">
                         <button
-                            class="btn icon-no-margin"
+                            class="btn btn-icon icon-size-3"
                             data-toggler="drawers"
                             data-action="toggle"
                             data-target="theme_boost-drawers-courseindex"
@@ -124,7 +124,7 @@
                 {{#hasblocks}}
                     <div class="drawer-toggler drawer-right-toggle ms-auto d-print-none">
                         <button
-                            class="btn icon-no-margin"
+                            class="btn btn-icon icon-size-3"
                             data-toggler="drawers"
                             data-action="toggle"
                             data-target="theme_boost-drawers-blocks"
diff --git a/public/theme/classic/style/moodle.css b/public/theme/classic/style/moodle.css
index d60d510c5be..72a3b82cc04 100644
--- a/public/theme/classic/style/moodle.css
+++ b/public/theme/classic/style/moodle.css
@@ -39439,13 +39439,10 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
   z-index: 2;
 }
 .drawer-toggles .drawer-toggler .btn {
-  padding: 8px;
   margin: auto 16px;
   background-color: #dee2e6;
-}
-.drawer-toggles .drawer-toggler .btn .icon {
-  width: auto;
-  height: auto;
+  width: 40px;
+  height: 40px;
 }
 .drawer-toggles .drawer-toggler .btn:focus {
   box-shadow: 0 0 0 0.25rem rgba(15, 108, 191, 0.75);