From c218e921d2c2fb9f96f82e72a8adfd71e20263f0 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 23 Dec 2021 09:48:50 +0100
Subject: [PATCH] MDL-72739 theme_boost: fixed updated edit switch behat

---
 lib/templates/editswitch.mustache              | 2 +-
 theme/boost/scss/moodle/debug.scss             | 1 +
 theme/boost/scss/moodle/primarynavigation.scss | 5 +++++
 theme/boost/style/moodle.css                   | 7 ++++++-
 theme/classic/style/moodle.css                 | 7 ++++++-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/templates/editswitch.mustache b/lib/templates/editswitch.mustache
index 9eb8abb4c92..848373ce935 100644
--- a/lib/templates/editswitch.mustache
+++ b/lib/templates/editswitch.mustache
@@ -45,7 +45,7 @@
                 }}{{^checked}}{{!
                     }} aria-checked="false"{{!
                 }}{{/checked}}{{!
-                }} class="custom-control-input z-index-1 w-100"{{!
+                }} class="custom-control-input"{{!
                 }} id="{{uniqid}}-editingswitch"{{!
                 }} data-context="{{{pagecontextid}}}"{{!
                 }} data-pageurl="{{{pageurl}}}"{{!
diff --git a/theme/boost/scss/moodle/debug.scss b/theme/boost/scss/moodle/debug.scss
index d7da55df916..6f09d467c83 100644
--- a/theme/boost/scss/moodle/debug.scss
+++ b/theme/boost/scss/moodle/debug.scss
@@ -33,6 +33,7 @@ body.behat-site {
         position: static;
         z-index: 0;
         opacity: 1;
+        width: auto;
     }
     .custom-control-label {
         &::before,
diff --git a/theme/boost/scss/moodle/primarynavigation.scss b/theme/boost/scss/moodle/primarynavigation.scss
index c59acf33ff6..ca33a3df217 100644
--- a/theme/boost/scss/moodle/primarynavigation.scss
+++ b/theme/boost/scss/moodle/primarynavigation.scss
@@ -19,6 +19,11 @@
     }
 }
 
+.editmode-switch-form .custom-control-input {
+    width: 100%;
+    z-index: 1;
+}
+
 .drawer-primary .drawercontent {
     padding: 0;
 
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 1232f196534..5fa9bebe7f9 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -19656,7 +19656,8 @@ body.behat-site .custom-switch {
 body.behat-site .custom-control-input {
   position: static;
   z-index: 0;
-  opacity: 1; }
+  opacity: 1;
+  width: auto; }
 
 body.behat-site .custom-control-label::before, body.behat-site .custom-control-label::after {
   content: none; }
@@ -21326,6 +21327,10 @@ div.editor_atto_toolbar button .icon {
     font-size: 0;
     color: transparent; } }
 
+.editmode-switch-form .custom-control-input {
+  width: 100%;
+  z-index: 1; }
+
 .drawer-primary .drawercontent {
   padding: 0; }
   .drawer-primary .drawercontent .list-group {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index c3b25bde58b..a09df640a29 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -19602,7 +19602,8 @@ body.behat-site .custom-switch {
 body.behat-site .custom-control-input {
   position: static;
   z-index: 0;
-  opacity: 1; }
+  opacity: 1;
+  width: auto; }
 
 body.behat-site .custom-control-label::before, body.behat-site .custom-control-label::after {
   content: none; }
@@ -21272,6 +21273,10 @@ div.editor_atto_toolbar button .icon {
     font-size: 0;
     color: transparent; } }
 
+.editmode-switch-form .custom-control-input {
+  width: 100%;
+  z-index: 1; }
+
 .drawer-primary .drawercontent {
   padding: 0; }
   .drawer-primary .drawercontent .list-group {