Merge branch 'MDL-62200-34' of git://github.com/bmbrands/moodle into …

…MOODLE_34_STABLE
moodle · May 10, 2018 · 43f86202dc725a723ca64e158009112fef023b1f · 43f8620
2 parents 0cd244b + 1ed8bd1
commit 43f86202dc725a723ca64e158009112fef023b1f
Unified Split

Showing with 23 additions and 0 deletions.

+12 −0 theme/boost/scss/moodle/core.scss

+8 −0 theme/bootstrapbase/less/moodle/core.less

+3 −0 theme/bootstrapbase/style/moodle.css
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
@@ -1172,6 +1172,18 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     background-color: $gray;
 }
 
+// Prevent adding backdrops to popups in popups.
+.pagelayout-popup {
+    .moodle-dialogue-base {
+        .moodle-dialogue-lightbox {
+            background-color: transparent;
+        }
+        .moodle-dialogue {
+            box-shadow: $popover-box-shadow;
+        }
+    }
+}
+
 .moodle-dialogue-base .hidden,
 .moodle-dialogue-base .moodle-dialogue-hidden {
     display: none;

diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
@@ -1332,6 +1332,14 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .moodle-dialogue-base .moodle-dialogue-lightbox {
     background-color: #aaa;
 }
+// Prevent adding backdrops to popups in popups.
+.pagelayout-popup {
+    .moodle-dialogue-base {
+        .moodle-dialogue-lightbox {
+            background-color: transparent;
+        }
+    }
+}
 .moodle-dialogue-base .hidden,
 .moodle-dialogue-base .moodle-dialogue-hidden {
     display: none;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
@@ -3659,6 +3659,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
 .moodle-dialogue-base .moodle-dialogue-lightbox {
   background-color: #aaa;
 }
+.pagelayout-popup .moodle-dialogue-base .moodle-dialogue-lightbox {
+  background-color: transparent;
+}
 .moodle-dialogue-base .hidden,
 .moodle-dialogue-base .moodle-dialogue-hidden {
   display: none;