From 526e04f5405ab3f7d5c145d4fc02f90ac6c6897e Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 4 Sep 2024 12:16:32 +0100
Subject: [PATCH 1/2] MDL-83016 javascript: apply appropriate icon class to
 legacy spinner.

---
 lib/javascript-static.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index bca7adc7ee0..3b60787881d 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -845,8 +845,7 @@ M.util.add_spinner = function(Y, node) {
 
     var spinner = Y.Node.create('<img />')
         .setAttribute('src', M.util.image_url(WAITICON.pix, WAITICON.component))
-        .addClass('spinner')
-        .addClass('iconsmall')
+        .addClass('spinner icon')
         .hide();
 
     node.append(spinner);

From b24887b16856dfdb958b7b5ce564c078dcbbdfeb Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 4 Sep 2024 12:40:44 +0100
Subject: [PATCH 2/2] MDL-83016 course: set icon size when used as background
 in tree.

---
 theme/boost/scss/moodle/course.scss | 3 ++-
 theme/boost/style/moodle.css        | 3 ++-
 theme/classic/style/moodle.css      | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index 61a38503ab7..96554099ce2 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -612,9 +612,9 @@ span.editinstructions {
     .coursebox > .info > .coursename a {
         display: block;
         background-image: url([[pix:moodle|i/course]]);
+        background-size: $icon-width $icon-height;
         background-repeat: no-repeat;
         padding-left: 21px;
-        background-position: left 0.2em;
     }
 }
 
@@ -690,6 +690,7 @@ span.editinstructions {
 
 .course_category_tree .category.with_children > .info > .categoryname {
     background-image: url([[pix:moodle|t/expanded]]);
+    background-size: $icon-width $icon-height;
     background-repeat: no-repeat;
     background-position: center left;
 }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 4ca9d8a606a..69211319ef8 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -28592,9 +28592,9 @@ span.editinstructions .alert-link {
 #frontpage-category-combo .coursebox > .info > .coursename a {
   display: block;
   background-image: url([[pix:moodle|i/course]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   padding-left: 21px;
-  background-position: left 0.2em;
 }
 
 .coursebox > .info > .coursename {
@@ -28667,6 +28667,7 @@ span.editinstructions .alert-link {
 
 .course_category_tree .category.with_children > .info > .categoryname {
   background-image: url([[pix:moodle|t/expanded]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   background-position: center left;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 8091f1f81f0..4b50d43853f 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -28592,9 +28592,9 @@ span.editinstructions .alert-link {
 #frontpage-category-combo .coursebox > .info > .coursename a {
   display: block;
   background-image: url([[pix:moodle|i/course]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   padding-left: 21px;
-  background-position: left 0.2em;
 }
 
 .coursebox > .info > .coursename {
@@ -28667,6 +28667,7 @@ span.editinstructions .alert-link {
 
 .course_category_tree .category.with_children > .info > .categoryname {
   background-image: url([[pix:moodle|t/expanded]]);
+  background-size: 16px 16px;
   background-repeat: no-repeat;
   background-position: center left;
 }