Merge branch 'MDL-81184-main' of https://github.com/roland04/moodle

moodle · Mar 12, 2024 · 7f138ac · 7f138ac
2 parents 2202ed0 + 513a574
commit 7f138ac
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/theme/boost/scss/moodle/debug.scss b/theme/boost/scss/moodle/debug.scss
@@ -12,6 +12,10 @@ body.behat-site {
     .stickyfooter {
         position: inherit;
         z-index: inherit;
+        .sticky-footer-content-wrapper {
+            padding: 0;
+            margin: 0;
+        }
     }
 
     // We need more spacing in action menus so behat does not click on the wrong menu item.

diff --git a/theme/boost/scss/moodle/sticky-footer.scss b/theme/boost/scss/moodle/sticky-footer.scss
@@ -11,7 +11,7 @@ body {
     position: fixed;
     right: 0;
     left: 0;
-    height: $stickyfooter-height;
+    min-height: $stickyfooter-height;
     bottom: calc(#{$stickyfooter-height} * -1);
     transition: bottom .5s;
     z-index: $zindex-fixed;

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -36023,6 +36023,11 @@ body.behat-site .stickyfooter {
   position: inherit;
   z-index: inherit;
 }
+body.behat-site.hasstickyfooter .stickyfooter .sticky-footer-content-wrapper,
+body.behat-site .stickyfooter .sticky-footer-content-wrapper {
+  padding: 0;
+  margin: 0;
+}
 body.behat-site .dropdown-item {
   margin-top: 4px !important; /* stylelint-disable declaration-no-important */
 }
@@ -36112,7 +36117,7 @@ body {
   position: fixed;
   right: 0;
   left: 0;
-  height: max(80px, 0.9375rem * 3);
+  min-height: max(80px, 0.9375rem * 3);
   bottom: calc(max(80px, 0.9375rem * 3) * -1);
   transition: bottom 0.5s;
   z-index: 1030;

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -35957,6 +35957,11 @@ body.behat-site .stickyfooter {
   position: inherit;
   z-index: inherit;
 }
+body.behat-site.hasstickyfooter .stickyfooter .sticky-footer-content-wrapper,
+body.behat-site .stickyfooter .sticky-footer-content-wrapper {
+  padding: 0;
+  margin: 0;
+}
 body.behat-site .dropdown-item {
   margin-top: 4px !important; /* stylelint-disable declaration-no-important */
 }
@@ -36046,7 +36051,7 @@ body {
   position: fixed;
   right: 0;
   left: 0;
-  height: max(80px, 0.9375rem * 3);
+  min-height: max(80px, 0.9375rem * 3);
   bottom: calc(max(80px, 0.9375rem * 3) * -1);
   transition: bottom 0.5s;
   z-index: 1030;