Merge branch 'MDL-81655_404' of https://github.com/larsbonczek/moodle into MOODLE_404_STABLE

lib/outputrenderers.php

@@ -856,7 +856,7 @@ class core_renderer extends renderer_base {
             $timeleft = $CFG->maintenance_later - time();
             // If timeleft less than 30 sec, set the class on block to error to highlight.
             $errorclass = ($timeleft < 30) ? 'alert-error alert-danger' : 'alert-warning';
-            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-3 alert');
+            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning alert');
             $a = new stdClass();
             $a->hour = (int)($timeleft / 3600);
             $a->min = (int)(floor($timeleft / 60) % 60);

theme/boost/scss/moodle/admin.scss

@@ -614,9 +614,13 @@
     position: fixed;
     bottom: 0;
     right: 0;
+    margin: 1rem;
     overflow: hidden;
     z-index: $zindex-dropdown;
 }
+.jsenabled .maintenancewarning {
+    @include transition(0.2s);
+}
 
 .modal.modal-in-page {
     z-index: 0;

theme/boost/scss/moodle/core.scss

@@ -2237,6 +2237,10 @@ $footer-link-color: $bg-inverse-link-color !default;
     bottom: calc(4rem + #{$stickyfooter-height});
 }
 
+.hasstickyfooter .maintenancewarning {
+    bottom: #{$stickyfooter-height};
+}
+
 .popover.footer {
     .popover-body {
         padding: 0;
@@ -2268,6 +2272,10 @@ $footer-link-color: $bg-inverse-link-color !default;
         display: block;
         z-index: $zindex-dropdown;
     }
+    .jsenabled .maintenancewarning,
+    .jsenabled.hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+        right: 5rem;
+    }
 }
 
 .bg-inverse a {

theme/boost/scss/moodle/layout.scss

@@ -175,6 +175,12 @@
             visibility: hidden;
         }
     }
+    .hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+        right: 2rem;
+    }
+    .hasstickyfooter:has(.drawer-left-toggle) .maintenancewarning {
+        margin-left: 3.5rem;
+    }
 }
 
 @include media-breakpoint-up(sm) {
@@ -233,6 +239,9 @@
             .jsenabled & .btn-footer-communication {
                 right: calc(#{$drawer-right-width} + 2rem);
             }
+            .jsenabled:has(&) .maintenancewarning {
+                right: calc(#{$drawer-right-width} + 5rem);
+            }
         }
         &.show-drawer-left.show-drawer-right {
             margin-left: $drawer-left-width;

theme/boost/style/moodle.css

@@ -25199,6 +25199,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
   bottom: calc(4rem + max(80px, 0.9375rem * 3));
 }
 
+.hasstickyfooter .maintenancewarning {
+  bottom: max(80px, 0.9375rem * 3);
+}
+
 .popover.footer .popover-body {
   padding: 0;
 }
@@ -25226,6 +25230,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
     display: block;
     z-index: 1000;
   }
+  .jsenabled .maintenancewarning,
+  .jsenabled.hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 5rem;
+  }
 }
 .bg-inverse a {
   color: #fff;
@@ -26943,10 +26951,20 @@ body.behat-site .action-menu .dropdown-subpanel-content.show {
   position: fixed;
   bottom: 0;
   right: 0;
+  margin: 1rem;
   overflow: hidden;
   z-index: 1000;
 }
 
+.jsenabled .maintenancewarning {
+  transition: 0.2s;
+}
+@media (prefers-reduced-motion: reduce) {
+  .jsenabled .maintenancewarning {
+    transition: none;
+  }
+}
+
 .modal.modal-in-page {
   z-index: 0;
 }
@@ -37003,6 +37021,12 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
     pointer-events: auto;
     visibility: hidden;
   }
+  .hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 2rem;
+  }
+  .hasstickyfooter:has(.drawer-left-toggle) .maintenancewarning {
+    margin-left: 3.5rem;
+  }
 }
 @media (min-width: 576px) {
   #page.drawers .main-inner {
@@ -37062,6 +37086,9 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
   .jsenabled #page.drawers.show-drawer-right .popover-process-monitor, .jsenabled #page.drawers.show-drawer-right .btn-footer-popover, .jsenabled #page.drawers.show-drawer-right .btn-footer-communication {
     right: calc(315px + 2rem);
   }
+  .jsenabled:has(#page.drawers.show-drawer-right) .maintenancewarning {
+    right: calc(315px + 5rem);
+  }
 }
 @media (min-width: 992px) {
   #page.drawers.show-drawer-left.show-drawer-right {

theme/classic/style/moodle.css

@@ -25199,6 +25199,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
   bottom: calc(4rem + max(80px, 0.9375rem * 3));
 }
 
+.hasstickyfooter .maintenancewarning {
+  bottom: max(80px, 0.9375rem * 3);
+}
+
 .popover.footer .popover-body {
   padding: 0;
 }
@@ -25226,6 +25230,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
     display: block;
     z-index: 1000;
   }
+  .jsenabled .maintenancewarning,
+  .jsenabled.hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 5rem;
+  }
 }
 .bg-inverse a {
   color: #fff;
@@ -26943,10 +26951,20 @@ body.behat-site .action-menu .dropdown-subpanel-content.show {
   position: fixed;
   bottom: 0;
   right: 0;
+  margin: 1rem;
   overflow: hidden;
   z-index: 1000;
 }
 
+.jsenabled .maintenancewarning {
+  transition: 0.2s;
+}
+@media (prefers-reduced-motion: reduce) {
+  .jsenabled .maintenancewarning {
+    transition: none;
+  }
+}
+
 .modal.modal-in-page {
   z-index: 0;
 }
@@ -36937,6 +36955,12 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
     pointer-events: auto;
     visibility: hidden;
   }
+  .hasstickyfooter:has(.drawer-right-toggle) .maintenancewarning {
+    right: 2rem;
+  }
+  .hasstickyfooter:has(.drawer-left-toggle) .maintenancewarning {
+    margin-left: 3.5rem;
+  }
 }
 @media (min-width: 576px) {
   #page.drawers .main-inner {
@@ -36996,6 +37020,9 @@ body.tox-fullscreen .tox.tox-tinymce-aux {
   .jsenabled #page.drawers.show-drawer-right .popover-process-monitor, .jsenabled #page.drawers.show-drawer-right .btn-footer-popover, .jsenabled #page.drawers.show-drawer-right .btn-footer-communication {
     right: calc(315px + 2rem);
   }
+  .jsenabled:has(#page.drawers.show-drawer-right) .maintenancewarning {
+    right: calc(315px + 5rem);
+  }
 }
 @media (min-width: 992px) {
   #page.drawers.show-drawer-left.show-drawer-right {