Merge branch 'MDL-72361-master' of git://github.com/bmbrands/moodle

This commit is contained in:
Andrew Nicols 2021-08-26 12:20:47 +08:00
commit aa241e8047
6 changed files with 9 additions and 20 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -63,17 +63,6 @@ const isSmall = () => {
return browserWidth < sizes.medium;
};
/**
* Check if the user uses a medium size browser.
*
* @returns {boolean} true if the body is smaller than sizes.medium max size.
* @private
*/
const isMedium = () => {
const browserWidth = getCurrentWidth();
return (browserWidth >= sizes.medium) && (browserWidth < sizes.large);
};
/**
* Check if the user uses a large size browser.
*
@ -340,7 +329,7 @@ export default class Drawers {
getBackdrop().then(backdrop => {
backdrop.hide();
if (isMedium()) {
if (isSmall()) {
const pageWrapper = document.getElementById('page-wrapper');
pageWrapper.style.overflow = 'auto';
}

View File

@ -35,8 +35,8 @@
#page.drawers {
margin-top: calc(#{$navbar-height} + 2rem);
padding-left: 10px;
padding-right: 10px;
padding-left: 15px;
padding-right: 15px;
.main-inner {
max-width: 100%;
width: 100%;

View File

@ -19455,8 +19455,8 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
#page.drawers {
margin-top: calc(50px + 2rem);
padding-left: 10px;
padding-right: 10px; }
padding-left: 15px;
padding-right: 15px; }
#page.drawers .main-inner {
max-width: 100%;
width: 100%;

View File

@ -19645,8 +19645,8 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
#page.drawers {
margin-top: calc(50px + 2rem);
padding-left: 10px;
padding-right: 10px; }
padding-left: 15px;
padding-right: 15px; }
#page.drawers .main-inner {
max-width: 100%;
width: 100%;