From 99df051805c393d10ea51087f0f0a91c1144862a Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Fri, 2 Feb 2018 03:26:26 +0000
Subject: [PATCH] MDL-61135 templates: improve loading icon for loading
 templates

---
 lib/templates/loading.mustache            | 2 +-
 lib/templates/overlay_loading.mustache    | 2 +-
 theme/boost/scss/moodle/core.scss         | 6 +++---
 theme/bootstrapbase/less/moodle/core.less | 6 +++---
 theme/bootstrapbase/style/moodle.css      | 5 +++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/templates/loading.mustache b/lib/templates/loading.mustache
index d8199b98472..c5fe4ee389a 100644
--- a/lib/templates/loading.mustache
+++ b/lib/templates/loading.mustache
@@ -33,4 +33,4 @@
     Example context (json):
     {}
 }}
-<span class="loading-icon">{{#pix}} y/loading, core, {{#str}} loading {{/str}} {{/pix}}</span>
+<span class="loading-icon">{{#pix}} i/loading, core, {{#str}} loading {{/str}} {{/pix}}</span>
diff --git a/lib/templates/overlay_loading.mustache b/lib/templates/overlay_loading.mustache
index 4cf2a2d5be4..243ea75df0d 100644
--- a/lib/templates/overlay_loading.mustache
+++ b/lib/templates/overlay_loading.mustache
@@ -33,6 +33,6 @@
     Example context (json):
     {}
 }}
-<span class="overlay-icon-container hidden" data-region="overlay-icon-container">
+<span class="overlay-icon-container {{$hiddenclass}}{{^visible}}hidden{{/visible}}{{/hiddenclass}}" data-region="overlay-icon-container">
     {{> core/loading }}
 </span>
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 8a9ff6d9723..bf0bb17833e 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2179,9 +2179,9 @@ $footer-link-color: $bg-inverse-link-color !default;
         transform: translate(-50%, -50%);
 
         .icon {
-            height: 40px;
-            width: 40px;
-
+            height: 30px;
+            width: 30px;
+            font-size: 30px;
         }
     }
 }
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 52627ad92c3..eeb6b2fdadc 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -2404,9 +2404,9 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
         transform: translate(-50%, -50%);
 
         .icon {
-            height: 40px;
-            width: 40px;
-
+            height: 30px;
+            width: 30px;
+            font-size: 30px;
         }
     }
 }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 600138f46f4..7574aab518b 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -4795,8 +4795,9 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
   transform: translate(-50%, -50%);
 }
 .overlay-icon-container .loading-icon .icon {
-  height: 40px;
-  width: 40px;
+  height: 30px;
+  width: 30px;
+  font-size: 30px;
 }
 [data-drag-type="move"] {
   cursor: move;