Merge branch 'MDL-73092-master' of https://github.com/bmbrands/moodle

This commit is contained in:
Jun Pataleta 2021-11-26 12:32:33 +08:00
commit cef9c111cc
4 changed files with 51 additions and 44 deletions

View File

@ -2,6 +2,8 @@
$fixed-header-y: $navbar-height;
$drawer-width: 285px !default;
$drawer-left-width: 285px !default;
$drawer-right-width: 315px !default;
$drawer-padding-x: 20px !default;
$drawer-padding-y: 20px !default;
$drawer-offscreen-gutter: 20px !default;
@ -93,20 +95,20 @@ body.drawer-ease {
body:not(.uses-drawers).drawer-open-left {
@include media-breakpoint-up(md) {
margin-left: $drawer-width;
margin-left: $drawer-left-width;
}
}
body.drawer-open-left #page.drawers {
@include media-breakpoint-up(md) {
margin-left: $drawer-width;
margin-left: $drawer-left-width;
padding-left: 1rem;
}
}
body.drawer-open-right {
@include media-breakpoint-up(md) {
margin-right: $drawer-width;
margin-right: $drawer-right-width;
}
}
@ -172,13 +174,10 @@ $right-drawer-width: 320px;
}
@mixin drawertypes() {
&.drawer-left,
&.drawer-right {
width: $drawer-width;
max-width: $drawer-width;
}
&.drawer-right {
right: calc(-#{$drawer-width} + -10px);
width: $drawer-right-width;
max-width: $drawer-right-width;
right: calc(-#{$drawer-right-width} + -10px);
@include box-shadow($box-shadow-drawer-right);
&.show {
@ -191,7 +190,9 @@ $right-drawer-width: 320px;
}
}
&.drawer-left {
left: calc(-#{$drawer-width} + -10px);
width: $drawer-left-width;
max-width: $drawer-left-width;
left: calc(-#{$drawer-left-width} + -10px);
@include box-shadow($box-shadow-drawer-left);
&.show {

View File

@ -157,18 +157,18 @@
left: 0;
right: 0;
&.show-drawer-left {
margin-left: $drawer-width;
margin-left: $drawer-left-width;
margin-right: 0;
padding-left: 1rem;
}
&.show-drawer-right {
margin-left: 0;
margin-right: $drawer-width;
margin-right: $drawer-right-width;
padding-right: 1rem;
}
&.show-drawer-left.show-drawer-right {
margin-left: $drawer-width;
margin-right: $drawer-width;
margin-left: $drawer-left-width;
margin-right: $drawer-right-width;
}
}
}

View File

@ -14696,7 +14696,7 @@ body.drawer-ease {
@media (min-width: 768px) {
body.drawer-open-right {
margin-right: 285px; } }
margin-right: 315px; } }
[data-region=right-hand-drawer] {
display: flex;
@ -14745,17 +14745,18 @@ body.drawer-ease {
position: fixed;
height: 100vh;
top: 0; }
.drawer.drawer-left, .drawer.drawer-right {
width: 285px;
max-width: 285px; }
.drawer.drawer-right {
right: calc(-285px + -10px); }
width: 315px;
max-width: 315px;
right: calc(-315px + -10px); }
.drawer.drawer-right.show {
right: 0; }
.drawer.drawer-right .drawertoggle {
margin-left: auto;
margin-right: 5px; }
.drawer.drawer-left {
width: 285px;
max-width: 285px;
left: calc(-285px + -10px); }
.drawer.drawer-left.show {
left: 0; }
@ -14793,17 +14794,18 @@ body.drawer-ease {
position: fixed;
height: 100vh;
top: 0; }
.drawer-md.drawer-left, .drawer-md.drawer-right {
width: 285px;
max-width: 285px; }
.drawer-md.drawer-right {
right: calc(-285px + -10px); }
width: 315px;
max-width: 315px;
right: calc(-315px + -10px); }
.drawer-md.drawer-right.show {
right: 0; }
.drawer-md.drawer-right .drawertoggle {
margin-left: auto;
margin-right: 5px; }
.drawer-md.drawer-left {
width: 285px;
max-width: 285px;
left: calc(-285px + -10px); }
.drawer-md.drawer-left.show {
left: 0; }
@ -14824,17 +14826,18 @@ body.drawer-ease {
position: fixed;
height: 100vh;
top: 0; }
.drawer-sm.drawer-left, .drawer-sm.drawer-right {
width: 285px;
max-width: 285px; }
.drawer-sm.drawer-right {
right: calc(-285px + -10px); }
width: 315px;
max-width: 315px;
right: calc(-315px + -10px); }
.drawer-sm.drawer-right.show {
right: 0; }
.drawer-sm.drawer-right .drawertoggle {
margin-left: auto;
margin-right: 5px; }
.drawer-sm.drawer-left {
width: 285px;
max-width: 285px;
left: calc(-285px + -10px); }
.drawer-sm.drawer-left.show {
left: 0; }
@ -20131,11 +20134,11 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
padding-left: 1rem; }
#page.drawers.show-drawer-right {
margin-left: 0;
margin-right: 285px;
margin-right: 315px;
padding-right: 1rem; }
#page.drawers.show-drawer-left.show-drawer-right {
margin-left: 285px;
margin-right: 285px; } }
margin-right: 315px; } }
.drawercontrolbuttons {
margin-top: 92px; }

View File

@ -14696,7 +14696,7 @@ body.drawer-ease {
@media (min-width: 768px) {
body.drawer-open-right {
margin-right: 285px; } }
margin-right: 315px; } }
[data-region=right-hand-drawer] {
display: flex;
@ -14745,17 +14745,18 @@ body.drawer-ease {
position: fixed;
height: 100vh;
top: 0; }
.drawer.drawer-left, .drawer.drawer-right {
width: 285px;
max-width: 285px; }
.drawer.drawer-right {
right: calc(-285px + -10px); }
width: 315px;
max-width: 315px;
right: calc(-315px + -10px); }
.drawer.drawer-right.show {
right: 0; }
.drawer.drawer-right .drawertoggle {
margin-left: auto;
margin-right: 5px; }
.drawer.drawer-left {
width: 285px;
max-width: 285px;
left: calc(-285px + -10px); }
.drawer.drawer-left.show {
left: 0; }
@ -14793,17 +14794,18 @@ body.drawer-ease {
position: fixed;
height: 100vh;
top: 0; }
.drawer-md.drawer-left, .drawer-md.drawer-right {
width: 285px;
max-width: 285px; }
.drawer-md.drawer-right {
right: calc(-285px + -10px); }
width: 315px;
max-width: 315px;
right: calc(-315px + -10px); }
.drawer-md.drawer-right.show {
right: 0; }
.drawer-md.drawer-right .drawertoggle {
margin-left: auto;
margin-right: 5px; }
.drawer-md.drawer-left {
width: 285px;
max-width: 285px;
left: calc(-285px + -10px); }
.drawer-md.drawer-left.show {
left: 0; }
@ -14824,17 +14826,18 @@ body.drawer-ease {
position: fixed;
height: 100vh;
top: 0; }
.drawer-sm.drawer-left, .drawer-sm.drawer-right {
width: 285px;
max-width: 285px; }
.drawer-sm.drawer-right {
right: calc(-285px + -10px); }
width: 315px;
max-width: 315px;
right: calc(-315px + -10px); }
.drawer-sm.drawer-right.show {
right: 0; }
.drawer-sm.drawer-right .drawertoggle {
margin-left: auto;
margin-right: 5px; }
.drawer-sm.drawer-left {
width: 285px;
max-width: 285px;
left: calc(-285px + -10px); }
.drawer-sm.drawer-left.show {
left: 0; }
@ -20077,11 +20080,11 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
padding-left: 1rem; }
#page.drawers.show-drawer-right {
margin-left: 0;
margin-right: 285px;
margin-right: 315px;
padding-right: 1rem; }
#page.drawers.show-drawer-left.show-drawer-right {
margin-left: 285px;
margin-right: 285px; } }
margin-right: 315px; } }
.drawercontrolbuttons {
margin-top: 92px; }