fixup! MDL-80303 theme_boost: Clean and reorder course SCSS

roland04 · Nov 7, 2024 · 53391b7 · 53391b7
1 parent 4210176
commit 53391b7
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 31 deletions.
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
@@ -221,13 +221,6 @@ button.btn-close,
     padding: 0;
 }
 
-.section li.movehere a {
-    display: block;
-    width: 100%;
-    height: 2rem;
-    border: 2px dashed $gray-800;
-}
-
 .inline,
 .inline-list li {
     display: inline;

diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
@@ -229,6 +229,14 @@ $divider-hover-color: $primary !default;
     }
 }
 
+// Old movehere link styles.
+.section li.movehere a {
+    display: block;
+    width: 100%;
+    height: 2rem;
+    border: 2px dashed $gray-800;
+}
+
 /* Activities */
 
 .activity {
@@ -818,10 +826,6 @@ $divider-hover-color: $primary !default;
 }
 
 .editing {
-    // Remove old spinners if the reactive state is ready.
-    .course-content .stateready .section .spinner {
-        display: none;
-    }
     // New editing in progress spinners.
     .editinprogress {
         position: relative;

diff --git a/theme/boost/scss/moodle/deprecated.scss b/theme/boost/scss/moodle/deprecated.scss
@@ -60,3 +60,13 @@
 .path-course-view li.activity form.togglecompletion img {
     max-width: none; /* The width is 0 so ensure we don't end up with a relative max-width */
 }
+
+//
+// Deprecated since Moodle 5.0.
+//
+
+// In 6.0 all YUI section spinners wont be needed.
+.course-content .stateready .section .spinner {
+    @include deprecated-styles();
+    display: none;
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -23229,13 +23229,6 @@ button.btn-close:focus:hover,
   padding: 0;
 }
 
-.section li.movehere a {
-  display: block;
-  width: 100%;
-  height: 2rem;
-  border: 2px dashed #343a40;
-}
-
 .inline,
 .inline-list li {
   display: inline;
@@ -28274,6 +28267,13 @@ table.calendartable caption {
   z-index: 5;
 }
 
+.section li.movehere a {
+  display: block;
+  width: 100%;
+  height: 2rem;
+  border: 2px dashed #343a40;
+}
+
 /* Activities */
 .activity {
   list-style: none;
@@ -29169,9 +29169,6 @@ table.calendartable caption {
     transform: rotate(359deg);
   }
 }
-.editing .course-content .stateready .section .spinner {
-  display: none;
-}
 .editing .editinprogress {
   position: relative;
 }
@@ -38915,6 +38912,25 @@ body.behat-site .path-course-view li.activity form.togglecompletion::before,
   max-width: none; /* The width is 0 so ensure we don't end up with a relative max-width */
 }
 
+.course-content .stateready .section .spinner {
+  /* stylelint-disable declaration-no-important */
+  /* stylelint-enable */
+  display: none;
+}
+body.behat-site .course-content .stateready .section .spinner,
+.course-content .stateready .section .spinner body.behat-site.course-content .stateready .section .spinner, body.themedesignermode .course-content .stateready .section .spinner,
+.course-content .stateready .section .spinner body.themedesignermode.course-content .stateready .section .spinner {
+  outline: 3px dotted #ca3120 !important;
+  background-color: #fceeed !important;
+}
+body.behat-site .course-content .stateready .section .spinner::before,
+.course-content .stateready .section .spinner body.behat-site.course-content .stateready .section .spinner::before, body.themedesignermode .course-content .stateready .section .spinner::before,
+.course-content .stateready .section .spinner body.themedesignermode.course-content .stateready .section .spinner::before {
+  content: "Deprecated style in use" !important;
+  color: #ca3120 !important;
+  font-size: smaller !important;
+}
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -23229,13 +23229,6 @@ button.btn-close:focus:hover,
   padding: 0;
 }
 
-.section li.movehere a {
-  display: block;
-  width: 100%;
-  height: 2rem;
-  border: 2px dashed #343a40;
-}
-
 .inline,
 .inline-list li {
   display: inline;
@@ -28274,6 +28267,13 @@ table.calendartable caption {
   z-index: 5;
 }
 
+.section li.movehere a {
+  display: block;
+  width: 100%;
+  height: 2rem;
+  border: 2px dashed #343a40;
+}
+
 /* Activities */
 .activity {
   list-style: none;
@@ -29169,9 +29169,6 @@ table.calendartable caption {
     transform: rotate(359deg);
   }
 }
-.editing .course-content .stateready .section .spinner {
-  display: none;
-}
 .editing .editinprogress {
   position: relative;
 }
@@ -38849,6 +38846,25 @@ body.behat-site .path-course-view li.activity form.togglecompletion::before,
   max-width: none; /* The width is 0 so ensure we don't end up with a relative max-width */
 }
 
+.course-content .stateready .section .spinner {
+  /* stylelint-disable declaration-no-important */
+  /* stylelint-enable */
+  display: none;
+}
+body.behat-site .course-content .stateready .section .spinner,
+.course-content .stateready .section .spinner body.behat-site.course-content .stateready .section .spinner, body.themedesignermode .course-content .stateready .section .spinner,
+.course-content .stateready .section .spinner body.themedesignermode.course-content .stateready .section .spinner {
+  outline: 3px dotted #ca3120 !important;
+  background-color: #fceeed !important;
+}
+body.behat-site .course-content .stateready .section .spinner::before,
+.course-content .stateready .section .spinner body.behat-site.course-content .stateready .section .spinner::before, body.themedesignermode .course-content .stateready .section .spinner::before,
+.course-content .stateready .section .spinner body.themedesignermode.course-content .stateready .section .spinner::before {
+  content: "Deprecated style in use" !important;
+  color: #ca3120 !important;
+  font-size: smaller !important;
+}
+
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;