mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 23:42:11 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shamim Rezaie 2022-03-18 11:30:27 +11:00
commit bdccf3eb3b
8 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/templates/full_header.mustache
View File

@ -33,7 +33,7 @@
<div class="w-100">
<div class="d-flex flex-wrap">
{{#hasnavbar}}
<div id="page-navbar" class="p-1">
<div id="page-navbar">
{{{navbar}}}
</div>
{{/hasnavbar}}

4
theme/boost/scss/moodle/core.scss
View File

@ -2683,6 +2683,10 @@ $picker-emojis-per-row: 7 !default;
font-weight: $font-weight-bold;
}
.breadcrumb:empty {
padding: 0;
}
@include media-breakpoint-down(sm) {
#page-navbar {
width: 100%;

7
theme/boost/scss/moodle/drawer.scss
View File

@ -83,12 +83,7 @@ $drawer-bg: darken($body-bg, 5%) !default;
}
}
}
#page {
margin-top: $fixed-header-y;
}
.pagelayout-embedded #page {
margin-top: 0;
}
body.drawer-ease {
@include transition(margin-left 0.5s ease, margin-right 0.5s ease);
}

12
theme/boost/scss/moodle/layout.scss
View File

@ -34,7 +34,7 @@
}
#page.drawers {
margin-top: calc(#{$navbar-height} + 2rem);
margin-top: $navbar-height;
padding-left: 15px;
padding-right: 15px;
@include thin-scrolls($gray-100);
@ -45,7 +45,7 @@
@include border-radius();
background-color: $white;
padding: 1.5rem 0.5rem;
margin-top: 3rem;
margin-top: 0.5rem;
margin-bottom: 3rem;
flex: 1 0 auto;
}
@ -170,11 +170,16 @@
}
}
@include media-breakpoint-up(sm) {
#page.drawers .main-inner {
margin-top: 1.5rem;
}
}
@include media-breakpoint-up(md) {
// Add some padding for the drawer toggle buttons
#page.drawers {
margin-top: $navbar-height;
padding-left: 3rem;
padding-right: 3rem;
}
@ -192,7 +197,6 @@
overflow-y: auto;
@include transition(0.2s);
height: calc(100vh - #{$navbar-height});
margin-top: $navbar-height;
left: 0;
right: 0;
&.show-drawer-left {

3
theme/boost/scss/moodle/navbar.scss
View File

@ -165,3 +165,6 @@
#page {
margin-top: $navbar-height;
}
.pagelayout-embedded #page {
margin-top: 0;
}

2
theme/boost/scss/preset/default.scss
View File

@ -52,7 +52,7 @@ $navbar-light-color: rgba($black, 0.6) !default;
$navbar-light-hover-color: rgba($black, .9) !default;
// Breadcrumbs
$breadcrumb-padding-y: .25rem !default;
$breadcrumb-padding-y: .5rem !default;
$breadcrumb-padding-x: 0 !default;
$breadcrumb-item-padding: .5rem !default;
$breadcrumb-margin-bottom: 0 !default;

24
theme/boost/style/moodle.css
View File

@ -5905,7 +5905,7 @@ input[type="button"].btn-block {
.breadcrumb {
display: flex;
flex-wrap: wrap;
padding: 0.25rem 0;
padding: 0.5rem 0;
margin-bottom: 0;
list-style: none;
background-color: transparent;
@ -12031,6 +12031,9 @@ input[disabled] {
.alert a {
font-weight: 700; }
.breadcrumb:empty {
padding: 0; }
@media (max-width: 767.98px) {
#page-navbar {
width: 100%; }
@ -14904,12 +14907,6 @@ span.editinstructions {
#nav-drawer .list-group li:last-child {
margin-bottom: 0; }
#page {
margin-top: 60px; }
.pagelayout-embedded #page {
margin-top: 0; }
body.drawer-ease {
transition: margin-left 0.5s ease, margin-right 0.5s ease; }
@media (prefers-reduced-motion: reduce) {
@ -20376,7 +20373,7 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
font-size: 4em; }
#page.drawers {
margin-top: calc(60px + 2rem);
margin-top: 60px;
padding-left: 15px;
padding-right: 15px;
scrollbar-width: thin;
@ -20398,7 +20395,7 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
border-radius: 0.5rem;
background-color: #fff;
padding: 1.5rem 0.5rem;
margin-top: 3rem;
margin-top: 0.5rem;
margin-bottom: 3rem;
flex: 1 0 auto; }
#page.drawers div[role="main"] {
@ -20484,9 +20481,12 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
pointer-events: auto;
visibility: hidden; } }
@media (min-width: 576px) {
#page.drawers .main-inner {
margin-top: 1.5rem; } }
@media (min-width: 768px) {
#page.drawers {
margin-top: 60px;
padding-left: 3rem;
padding-right: 3rem; } }
@ -20500,7 +20500,6 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
overflow-y: auto;
transition: 0.2s;
height: calc(100vh - 60px);
margin-top: 60px;
left: 0;
right: 0; } }
@media (min-width: 992px) and (prefers-reduced-motion: reduce) {
@ -21072,6 +21071,9 @@ div.editor_atto_toolbar button .icon {
#page {
margin-top: 60px; }
.pagelayout-embedded #page {
margin-top: 0; }
/**
* Reportbuilder.
*/

22
theme/classic/style/moodle.css
View File

@ -12031,6 +12031,9 @@ input[disabled] {
.alert a {
font-weight: 700; }
.breadcrumb:empty {
padding: 0; }
@media (max-width: 767.98px) {
#page-navbar {
width: 100%; }
@ -14904,12 +14907,6 @@ span.editinstructions {
#nav-drawer .list-group li:last-child {
margin-bottom: 0; }
#page {
margin-top: 50px; }
.pagelayout-embedded #page {
margin-top: 0; }
body.drawer-ease {
transition: margin-left 0.5s ease, margin-right 0.5s ease; }
@media (prefers-reduced-motion: reduce) {
@ -20322,7 +20319,7 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
font-size: 4em; }
#page.drawers {
margin-top: calc(50px + 2rem);
margin-top: 50px;
padding-left: 15px;
padding-right: 15px;
scrollbar-width: thin;
@ -20344,7 +20341,7 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
border-radius: 0.25rem;
background-color: #fff;
padding: 1.5rem 0.5rem;
margin-top: 3rem;
margin-top: 0.5rem;
margin-bottom: 3rem;
flex: 1 0 auto; }
#page.drawers div[role="main"] {
@ -20430,9 +20427,12 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
pointer-events: auto;
visibility: hidden; } }
@media (min-width: 576px) {
#page.drawers .main-inner {
margin-top: 1.5rem; } }
@media (min-width: 768px) {
#page.drawers {
margin-top: 50px;
padding-left: 3rem;
padding-right: 3rem; } }
@ -20446,7 +20446,6 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
overflow-y: auto;
transition: 0.2s;
height: calc(100vh - 50px);
margin-top: 50px;
left: 0;
right: 0; } }
@media (min-width: 992px) and (prefers-reduced-motion: reduce) {
@ -21018,6 +21017,9 @@ div.editor_atto_toolbar button .icon {
#page {
margin-top: 50px; }
.pagelayout-embedded #page {
margin-top: 0; }
/**
* Reportbuilder.
*/