Skip to content

Commit

Permalink
Merge branch 'MDL-62200-master' of git://github.com/bmbrands/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed May 10, 2018
2 parents 7b6c744 + bfe00e6 commit 74e82e4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
12 changes: 12 additions & 0 deletions theme/boost/scss/moodle/core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,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;
Expand Down
8 changes: 8 additions & 0 deletions theme/bootstrapbase/less/moodle/core.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions theme/bootstrapbase/style/moodle.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 74e82e4

Please sign in to comment.