From f4516e8cbdd5b9b5194f48a1e8411cfcef1fee2b Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Fri, 26 Nov 2021 05:18:21 +1100
Subject: [PATCH] MDL-72910 theme: move show footer button when right drawer
 expands

---
 theme/boost/scss/moodle/drawer.scss | 3 +++
 theme/boost/scss/moodle/layout.scss | 3 +++
 theme/boost/style/moodle.css        | 6 +++++-
 theme/classic/style/moodle.css      | 6 +++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/theme/boost/scss/moodle/drawer.scss b/theme/boost/scss/moodle/drawer.scss
index 421cc713cf5..303d22f4ed5 100644
--- a/theme/boost/scss/moodle/drawer.scss
+++ b/theme/boost/scss/moodle/drawer.scss
@@ -49,6 +49,9 @@ $drawer-bg: darken($body-bg, 5%) !default;
     [data-region="drawer"] {
         padding: $drawer-padding-x $drawer-padding-y;
     }
+    .jsenabled .btn-footer-popover {
+        transition: 0.2s;
+    }
 }
 #nav-drawer {
     right: auto;
diff --git a/theme/boost/scss/moodle/layout.scss b/theme/boost/scss/moodle/layout.scss
index 633ed7a30f1..4fc96d96f32 100644
--- a/theme/boost/scss/moodle/layout.scss
+++ b/theme/boost/scss/moodle/layout.scss
@@ -165,6 +165,9 @@
             margin-left: 0;
             margin-right: $drawer-right-width;
             padding-right: 1rem;
+            .jsenabled & .btn-footer-popover {
+                right: calc(#{$drawer-right-width} + 2rem);
+            }
         }
         &.show-drawer-left.show-drawer-right {
             margin-left: $drawer-left-width;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 64f5b69b381..4b446a39f9d 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14666,7 +14666,9 @@ span.editinstructions {
 
 @media (min-width: 576px) {
   [data-region="drawer"] {
-    padding: 20px 20px; } }
+    padding: 20px 20px; }
+  .jsenabled .btn-footer-popover {
+    transition: 0.2s; } }
 
 #nav-drawer {
   right: auto;
@@ -20134,6 +20136,8 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
       margin-left: 0;
       margin-right: 315px;
       padding-right: 1rem; }
+      .jsenabled #page.drawers.show-drawer-right .btn-footer-popover {
+        right: calc(315px + 2rem); }
     #page.drawers.show-drawer-left.show-drawer-right {
       margin-left: 285px;
       margin-right: 315px; } }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 1caaa038dba..6261051a7e4 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -14666,7 +14666,9 @@ span.editinstructions {
 
 @media (min-width: 576px) {
   [data-region="drawer"] {
-    padding: 20px 20px; } }
+    padding: 20px 20px; }
+  .jsenabled .btn-footer-popover {
+    transition: 0.2s; } }
 
 #nav-drawer {
   right: auto;
@@ -20080,6 +20082,8 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
       margin-left: 0;
       margin-right: 315px;
       padding-right: 1rem; }
+      .jsenabled #page.drawers.show-drawer-right .btn-footer-popover {
+        right: calc(315px + 2rem); }
     #page.drawers.show-drawer-left.show-drawer-right {
       margin-left: 285px;
       margin-right: 315px; } }