moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-74297-master' of https://github.com/peterRd/moodle

Browse source
This commit is contained in:
Sara Arjona 2022-04-07 17:32:56 +02:00
commit 2ce8437d8e
7 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
theme/boost/amd/build/drawers.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
theme/boost/amd/build/drawers.min.js.map
View file

File diff suppressed because one or more lines are too long

4
theme/boost/amd/src/drawers.js
View file

@ -456,7 +456,7 @@ export default class Drawers {
getBackdrop().then(backdrop => { getBackdrop().then(backdrop => {
backdrop.show(); backdrop.show();
const pageWrapper = document.getElementById('page-wrapper'); const pageWrapper = document.getElementById('page');
pageWrapper.style.overflow = 'hidden'; pageWrapper.style.overflow = 'hidden';
return backdrop; return backdrop;
}) })
@ -522,7 +522,7 @@ export default class Drawers {
backdrop.hide(); backdrop.hide();
if (isSmall()) { if (isSmall()) {
const pageWrapper = document.getElementById('page-wrapper'); const pageWrapper = document.getElementById('page');
pageWrapper.style.overflow = 'auto'; pageWrapper.style.overflow = 'auto';
} }
return backdrop; return backdrop;

2
theme/boost/scss/moodle/grade.scss
View file

@ -427,7 +427,7 @@
tr.heading { tr.heading {
position: sticky; position: sticky;
top: 0; top: 0vh;
z-index: 1; z-index: 1;
} }

19
theme/boost/scss/moodle/sticky-footer.scss
View file

@ -13,7 +13,9 @@ body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
#page { #page {
flex: 1 0 auto; &:not(.drawers) {
flex: 1 0 auto;
}
display: flex; display: flex;
flex-direction: column; flex-direction: column;
#page-content { #page-content {
@ -25,3 +27,18 @@ body {
} }
} }
} }
@include media-breakpoint-down(sm) {
#page-wrapper {
height: 100%;
display: flex;
flex-direction: column;
#page {
&:not(.drawers) {
flex: 1 0 auto;
}
display: flex;
flex-direction: column;
}
}
}

16
theme/boost/style/moodle.css
View file

@ -19581,7 +19581,7 @@ p.arrow_button {
.path-grade-report-grader .gradeparent tr.heading { .path-grade-report-grader .gradeparent tr.heading {
position: sticky; position: sticky;
top: 0; top: 0vh;
z-index: 1; } z-index: 1; }
.path-grade-report-grader .gradeparent tr.lastrow { .path-grade-report-grader .gradeparent tr.lastrow {
@ -19927,14 +19927,26 @@ body {
display: flex; display: flex;
flex-direction: column; } flex-direction: column; }
#page-wrapper #page { #page-wrapper #page {
flex: 1 0 auto;
display: flex; display: flex;
flex-direction: column; } flex-direction: column; }
#page-wrapper #page:not(.drawers) {
flex: 1 0 auto; }
#page-wrapper #page #page-content { #page-wrapper #page #page-content {
flex: 1 0 auto; } flex: 1 0 auto; }
#page-wrapper #page-footer { #page-wrapper #page-footer {
flex-shrink: 0; } } flex-shrink: 0; } }
@media (max-width: 767.98px) {
#page-wrapper {
height: 100%;
display: flex;
flex-direction: column; }
#page-wrapper #page {
display: flex;
flex-direction: column; }
#page-wrapper #page:not(.drawers) {
flex: 1 0 auto; } }
.popover-region { .popover-region {
position: relative; } position: relative; }
.popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after { .popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after {

16
theme/classic/style/moodle.css
View file

@ -19581,7 +19581,7 @@ p.arrow_button {
.path-grade-report-grader .gradeparent tr.heading { .path-grade-report-grader .gradeparent tr.heading {
position: sticky; position: sticky;
top: 0; top: 0vh;
z-index: 1; } z-index: 1; }
.path-grade-report-grader .gradeparent tr.lastrow { .path-grade-report-grader .gradeparent tr.lastrow {
@ -19873,14 +19873,26 @@ body {
display: flex; display: flex;
flex-direction: column; } flex-direction: column; }
#page-wrapper #page { #page-wrapper #page {
flex: 1 0 auto;
display: flex; display: flex;
flex-direction: column; } flex-direction: column; }
#page-wrapper #page:not(.drawers) {
flex: 1 0 auto; }
#page-wrapper #page #page-content { #page-wrapper #page #page-content {
flex: 1 0 auto; } flex: 1 0 auto; }
#page-wrapper #page-footer { #page-wrapper #page-footer {
flex-shrink: 0; } } flex-shrink: 0; } }
@media (max-width: 767.98px) {
#page-wrapper {
height: 100%;
display: flex;
flex-direction: column; }
#page-wrapper #page {
display: flex;
flex-direction: column; }
#page-wrapper #page:not(.drawers) {
flex: 1 0 auto; } }
.popover-region { .popover-region {
position: relative; } position: relative; }
.popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after { .popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after {