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

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-12-16 16:49:42 +01:00
commit 3bdfc0ff81
11 changed files with 114 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

27
theme/boost/scss/moodle/core.scss
View file

@ -23,16 +23,6 @@ $font-size-xs: ($font-size-base * .75) !default;
background-color: $body-bg; background-color: $body-bg;
} }
@include media-breakpoint-up(sm) {
#region-main {
border: $card-border-width solid $card-border-color;
@if $enable-rounded {
@include border-radius($card-border-radius);
}
padding: $card-spacer-x;
}
}
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
.context-header-settings-menu, .context-header-settings-menu,
.region-main-settings-menu { .region-main-settings-menu {
@ -2059,7 +2049,7 @@ nav.navbar .logo img {
// Do not remove these rules. // Do not remove these rules.
overflow: hidden; overflow: hidden;
padding: 0.25rem; padding: 0.25rem 0;
.page-header-image, .page-header-image,
.page-header-headings { .page-header-headings {
@ -2315,7 +2305,7 @@ ul {
// rather than being specific to the footer. This is kept for backwards compatibility. // rather than being specific to the footer. This is kept for backwards compatibility.
$footer-link-color: $bg-inverse-link-color !default; $footer-link-color: $bg-inverse-link-color !default;
.footer-dark .container { .footer-dark {
a { a {
color: $footer-link-color; color: $footer-link-color;
text-decoration: underline; text-decoration: underline;
@ -2345,6 +2335,9 @@ $footer-link-color: $bg-inverse-link-color !default;
a { a {
color: $body-color; color: $body-color;
text-decoration: underline; text-decoration: underline;
.icon {
color: $body-color;
}
&:focus { &:focus {
text-decoration: none; text-decoration: none;
} }
@ -2910,12 +2903,12 @@ body.dragging {
} }
} }
.page-mycourses { .drawers {
#region-main {
padding: 0;
}
#region-main,
.block_myoverview { .block_myoverview {
border: 0; border: 0;
& > .card-body {
padding-left: 0 !important; /* stylelint-disable-line declaration-no-important */
padding-right: 0 !important; /* stylelint-disable-line declaration-no-important */
}
} }
} }

11
theme/boost/scss/moodle/layout.scss
View file

@ -43,9 +43,14 @@
margin: 0 auto; margin: 0 auto;
@include border-radius(); @include border-radius();
background-color: $white; background-color: $white;
padding: 1.5rem; padding: 1.5rem 0.5rem;
margin-top: 3rem; margin-top: 3rem;
margin-bottom: 3rem; margin-bottom: 3rem;
flex: 1 0 auto;
}
div[role="main"] {
padding-left: 15px;
padding-right: 15px;
} }
} }
@ -67,6 +72,8 @@
.header-maxwidth { .header-maxwidth {
max-width: $course-content-maxwidth; max-width: $course-content-maxwidth;
margin: 0 auto; margin: 0 auto;
padding-left: 15px;
padding-right: 15px;
.header-inner { .header-inner {
padding-left: 0; padding-left: 0;
@ -167,7 +174,7 @@
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
.drawer-left, .drawer-left,
.drawer-right { .drawer-right {
top: calc(#{$navbar-height} + 1px); top: $navbar-height;
height: calc(100vh - #{$navbar-height}); height: calc(100vh - #{$navbar-height});
} }

1
theme/boost/scss/moodle/login.scss
View file

@ -32,6 +32,7 @@ $login-identity-provider-btn-border: $border-color !default;
background-color: $logincontainer-bg; background-color: $logincontainer-bg;
padding: $logincontainer-padding; padding: $logincontainer-padding;
box-shadow: $logincontainer-shadow; box-shadow: $logincontainer-shadow;
margin-bottom: 2rem;
.login-languagemenu { .login-languagemenu {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;

7
theme/boost/scss/moodle/secondarynavigation.scss
View file

@ -1,10 +1,11 @@
.secondary-navigation { .secondary-navigation {
border-top: 1px solid $nav-tabs-border-color;
border-bottom: 1px solid $nav-tabs-border-color;
max-width: $course-content-maxwidth; max-width: $course-content-maxwidth;
margin: 0 auto; margin: 0 auto;
padding: 0 15px 15px;
.navigation { .navigation {
height: $moremenu-height; border-top: 1px solid $nav-tabs-border-color;
border-bottom: 1px solid $nav-tabs-border-color;
height: calc(#{$moremenu-height} + 2px);
background-color: $body-bg; background-color: $body-bg;
.nav-tabs { .nav-tabs {
border: none; border: none;

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

@ -23,7 +23,7 @@ $primary-nav-padding-y: ($spacer / 4) !default;
$primary-nav-padding-x: ($spacer / 2) !default; $primary-nav-padding-x: ($spacer / 2) !default;
$navbar-height: 60px !default; $navbar-height: 60px !default;
$course-content-maxwidth: 800px; $course-content-maxwidth: 830px;
$box-shadow-drawer-left: -0.25rem .25rem .8rem rgba($black, .025) !default; $box-shadow-drawer-left: -0.25rem .25rem .8rem rgba($black, .025) !default;
$box-shadow-drawer-right: 0 .25rem .8rem rgba($black, .025) !default; $box-shadow-drawer-right: 0 .25rem .8rem rgba($black, .025) !default;

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

@ -9871,12 +9871,6 @@ a.text-dark:hover, a.text-dark:focus {
overflow-y: visible; overflow-y: visible;
background-color: #fff; } background-color: #fff; }
@media (min-width: 576px) {
#region-main {
border: 1px solid rgba(0, 0, 0, 0.125);
border-radius: 0.25rem;
padding: 1.25rem; } }
@media (min-width: 576px) { @media (min-width: 576px) {
.context-header-settings-menu, .context-header-settings-menu,
.region-main-settings-menu { .region-main-settings-menu {
@ -11552,7 +11546,7 @@ nav.navbar .logo img {
/** Header-bar styles **/ /** Header-bar styles **/
.page-context-header { .page-context-header {
overflow: hidden; overflow: hidden;
padding: 0.25rem; } padding: 0.25rem 0; }
.page-context-header .page-header-image, .page-context-header .page-header-image,
.page-context-header .page-header-headings { .page-context-header .page-header-headings {
float: left; float: left;
@ -11741,12 +11735,12 @@ ul {
margin-top: 30px; margin-top: 30px;
margin-right: 0; } } margin-right: 0; } }
.footer-dark .container a { .footer-dark a {
color: #fff; color: #fff;
text-decoration: underline; } text-decoration: underline; }
.footer-dark .container a .icon { .footer-dark a .icon {
color: #fff; } color: #fff; }
.footer-dark .container a:focus .icon { .footer-dark a:focus .icon {
color: #1d2125; } color: #1d2125; }
.btn-footer-popover { .btn-footer-popover {
@ -11760,6 +11754,8 @@ ul {
.popover.footer .popover-body .footer-section a { .popover.footer .popover-body .footer-section a {
color: #1d2125; color: #1d2125;
text-decoration: underline; } text-decoration: underline; }
.popover.footer .popover-body .footer-section a .icon {
color: #1d2125; }
.popover.footer .popover-body .footer-section a:focus { .popover.footer .popover-body .footer-section a:focus {
text-decoration: none; } text-decoration: none; }
@ -12213,12 +12209,13 @@ body.dragging .dragging {
.collapse-list .collapse-list-item-content .collapse-list-item { .collapse-list .collapse-list-item-content .collapse-list-item {
padding-left: calc(1rem * 3); } padding-left: calc(1rem * 3); }
.page-mycourses #region-main { .drawers .block_myoverview {
padding: 0; }
.page-mycourses #region-main,
.page-mycourses .block_myoverview {
border: 0; } border: 0; }
.drawers .block_myoverview > .card-body {
padding-left: 0 !important;
/* stylelint-disable-line declaration-no-important */
padding-right: 0 !important;
/* stylelint-disable-line declaration-no-important */ }
.icon { .icon {
font-size: 16px; font-size: 16px;
@ -17513,7 +17510,8 @@ textarea[data-auto-rows] {
.login-container { .login-container {
background-color: #fff; background-color: #fff;
padding: 3rem; padding: 3rem;
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); } box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
margin-bottom: 2rem; }
.login-container .login-languagemenu { .login-container .login-languagemenu {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -20164,23 +20162,29 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
margin: 0 auto; margin: 0 auto;
border-radius: 0.25rem; border-radius: 0.25rem;
background-color: #fff; background-color: #fff;
padding: 1.5rem; padding: 1.5rem 0.5rem;
margin-top: 3rem; margin-top: 3rem;
margin-bottom: 3rem; } margin-bottom: 3rem;
flex: 1 0 auto; }
#page.drawers div[role="main"] {
padding-left: 15px;
padding-right: 15px; }
@media (min-width: 768px) { @media (min-width: 768px) {
.pagelayout-standard #page.drawers .main-inner, .pagelayout-standard #page.drawers .main-inner,
body.limitedwidth #page.drawers .main-inner { body.limitedwidth #page.drawers .main-inner {
max-width: 800px; } max-width: 830px; }
.pagelayout-standard #page.drawers .footer-popover, .pagelayout-standard #page.drawers .footer-popover,
body.limitedwidth #page.drawers .footer-popover { body.limitedwidth #page.drawers .footer-popover {
max-width: 800px; max-width: 830px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
border-radius: 0.25rem; } border-radius: 0.25rem; }
.header-maxwidth { .header-maxwidth {
max-width: 800px; max-width: 830px;
margin: 0 auto; } margin: 0 auto;
padding-left: 15px;
padding-right: 15px; }
.header-maxwidth .header-inner { .header-maxwidth .header-inner {
padding-left: 0; padding-left: 0;
padding-right: 0; } } padding-right: 0; } }
@ -20248,7 +20252,7 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
@media (min-width: 992px) { @media (min-width: 992px) {
.drawer-left, .drawer-left,
.drawer-right { .drawer-right {
top: calc(60px + 1px); top: 60px;
height: calc(100vh - 60px); } height: calc(100vh - 60px); }
#page.drawers { #page.drawers {
position: relative; position: relative;
@ -21301,12 +21305,13 @@ div.editor_atto_toolbar button .icon {
border-right: 0; } border-right: 0; }
.secondary-navigation { .secondary-navigation {
border-top: 1px solid #dee2e6; max-width: 830px;
border-bottom: 1px solid #dee2e6; margin: 0 auto;
max-width: 800px; padding: 0 15px 15px; }
margin: 0 auto; }
.secondary-navigation .navigation { .secondary-navigation .navigation {
height: 60px; border-top: 1px solid #dee2e6;
border-bottom: 1px solid #dee2e6;
height: calc(60px + 2px);
background-color: #fff; } background-color: #fff; }
.secondary-navigation .navigation .nav-tabs { .secondary-navigation .navigation .nav-tabs {
border: none; } border: none; }

2
theme/boost/templates/footer.mustache
View file

@ -64,7 +64,7 @@
</div> </div>
<div class="footer-content-debugging"> <div class="footer-content-debugging">
<div class="container"> <div class="container-fluid footer-dark-inner">
{{{ output.debug_footer_html }}} {{{ output.debug_footer_html }}}
</div> </div>
</div> </div>

2
theme/boost/templates/login.mustache
View file

@ -38,7 +38,7 @@
{{{ output.standard_top_of_body_html }}} {{{ output.standard_top_of_body_html }}}
<div id="page" class="container-fluid mt-0"> <div id="page" class="container-fluid pt-5 mt-0">
<div id="page-content" class="row"> <div id="page-content" class="row">
<div id="region-main-box" class="col-12"> <div id="region-main-box" class="col-12">
<section id="region-main" class="col-12 h-100" aria-label="{{#str}}content{{/str}}"> <section id="region-main" class="col-12 h-100" aria-label="{{#str}}content{{/str}}">

8
theme/classic/scss/classic/post.scss
View file

@ -24,6 +24,14 @@
flex: 0 0 $mainwidth-oneblock; flex: 0 0 $mainwidth-oneblock;
max-width: $mainwidth-oneblock; max-width: $mainwidth-oneblock;
padding: 0 1rem 0 0; padding: 0 1rem 0 0;
#region-main {
border: $card-border-width solid $card-border-color;
padding: $card-spacer-x;
@if $enable-rounded {
@include border-radius($card-border-radius);
}
}
} }
} }
&.blocks-post { &.blocks-post {

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

@ -9871,12 +9871,6 @@ a.text-dark:hover, a.text-dark:focus {
overflow-y: visible; overflow-y: visible;
background-color: #fff; } background-color: #fff; }
@media (min-width: 576px) {
#region-main {
border: 1px solid rgba(0, 0, 0, 0.125);
border-radius: 0.25rem;
padding: 1.25rem; } }
@media (min-width: 576px) { @media (min-width: 576px) {
.context-header-settings-menu, .context-header-settings-menu,
.region-main-settings-menu { .region-main-settings-menu {
@ -11552,7 +11546,7 @@ nav.navbar .logo img {
/** Header-bar styles **/ /** Header-bar styles **/
.page-context-header { .page-context-header {
overflow: hidden; overflow: hidden;
padding: 0.25rem; } padding: 0.25rem 0; }
.page-context-header .page-header-image, .page-context-header .page-header-image,
.page-context-header .page-header-headings { .page-context-header .page-header-headings {
float: left; float: left;
@ -11741,12 +11735,12 @@ ul {
margin-top: 30px; margin-top: 30px;
margin-right: 0; } } margin-right: 0; } }
.footer-dark .container a { .footer-dark a {
color: #fff; color: #fff;
text-decoration: underline; } text-decoration: underline; }
.footer-dark .container a .icon { .footer-dark a .icon {
color: #fff; } color: #fff; }
.footer-dark .container a:focus .icon { .footer-dark a:focus .icon {
color: #1d2125; } color: #1d2125; }
.btn-footer-popover { .btn-footer-popover {
@ -11760,6 +11754,8 @@ ul {
.popover.footer .popover-body .footer-section a { .popover.footer .popover-body .footer-section a {
color: #1d2125; color: #1d2125;
text-decoration: underline; } text-decoration: underline; }
.popover.footer .popover-body .footer-section a .icon {
color: #1d2125; }
.popover.footer .popover-body .footer-section a:focus { .popover.footer .popover-body .footer-section a:focus {
text-decoration: none; } text-decoration: none; }
@ -12213,12 +12209,13 @@ body.dragging .dragging {
.collapse-list .collapse-list-item-content .collapse-list-item { .collapse-list .collapse-list-item-content .collapse-list-item {
padding-left: calc(1rem * 3); } padding-left: calc(1rem * 3); }
.page-mycourses #region-main { .drawers .block_myoverview {
padding: 0; }
.page-mycourses #region-main,
.page-mycourses .block_myoverview {
border: 0; } border: 0; }
.drawers .block_myoverview > .card-body {
padding-left: 0 !important;
/* stylelint-disable-line declaration-no-important */
padding-right: 0 !important;
/* stylelint-disable-line declaration-no-important */ }
.icon { .icon {
font-size: 16px; font-size: 16px;
@ -17513,7 +17510,8 @@ textarea[data-auto-rows] {
.login-container { .login-container {
background-color: #fff; background-color: #fff;
padding: 3rem; padding: 3rem;
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); } box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
margin-bottom: 2rem; }
.login-container .login-languagemenu { .login-container .login-languagemenu {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -20110,23 +20108,29 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
margin: 0 auto; margin: 0 auto;
border-radius: 0.25rem; border-radius: 0.25rem;
background-color: #fff; background-color: #fff;
padding: 1.5rem; padding: 1.5rem 0.5rem;
margin-top: 3rem; margin-top: 3rem;
margin-bottom: 3rem; } margin-bottom: 3rem;
flex: 1 0 auto; }
#page.drawers div[role="main"] {
padding-left: 15px;
padding-right: 15px; }
@media (min-width: 768px) { @media (min-width: 768px) {
.pagelayout-standard #page.drawers .main-inner, .pagelayout-standard #page.drawers .main-inner,
body.limitedwidth #page.drawers .main-inner { body.limitedwidth #page.drawers .main-inner {
max-width: 800px; } max-width: 830px; }
.pagelayout-standard #page.drawers .footer-popover, .pagelayout-standard #page.drawers .footer-popover,
body.limitedwidth #page.drawers .footer-popover { body.limitedwidth #page.drawers .footer-popover {
max-width: 800px; max-width: 830px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
border-radius: 0.25rem; } border-radius: 0.25rem; }
.header-maxwidth { .header-maxwidth {
max-width: 800px; max-width: 830px;
margin: 0 auto; } margin: 0 auto;
padding-left: 15px;
padding-right: 15px; }
.header-maxwidth .header-inner { .header-maxwidth .header-inner {
padding-left: 0; padding-left: 0;
padding-right: 0; } } padding-right: 0; } }
@ -20194,7 +20198,7 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
@media (min-width: 992px) { @media (min-width: 992px) {
.drawer-left, .drawer-left,
.drawer-right { .drawer-right {
top: calc(50px + 1px); top: 50px;
height: calc(100vh - 50px); } height: calc(100vh - 50px); }
#page.drawers { #page.drawers {
position: relative; position: relative;
@ -21247,12 +21251,13 @@ div.editor_atto_toolbar button .icon {
border-right: 0; } border-right: 0; }
.secondary-navigation { .secondary-navigation {
border-top: 1px solid #dee2e6; max-width: 830px;
border-bottom: 1px solid #dee2e6; margin: 0 auto;
max-width: 800px; padding: 0 15px 15px; }
margin: 0 auto; }
.secondary-navigation .navigation { .secondary-navigation .navigation {
height: 50px; border-top: 1px solid #dee2e6;
border-bottom: 1px solid #dee2e6;
height: calc(50px + 2px);
background-color: #fff; } background-color: #fff; }
.secondary-navigation .navigation .nav-tabs { .secondary-navigation .navigation .nav-tabs {
border: none; } border: none; }
@ -21363,6 +21368,10 @@ body {
flex: 0 0 68%; flex: 0 0 68%;
max-width: 68%; max-width: 68%;
padding: 0 1rem 0 0; } padding: 0 1rem 0 0; }
#page-content.blocks-pre .region-main #region-main {
border: 1px solid rgba(0, 0, 0, 0.125);
padding: 1.25rem;
border-radius: 0.25rem; }
#page-content.blocks-post .region-main { #page-content.blocks-post .region-main {
flex: 0 0 68%; flex: 0 0 68%;
max-width: 68%; max-width: 68%;
@ -21424,6 +21433,10 @@ body {
flex: 0 0 75%; flex: 0 0 75%;
max-width: 75%; max-width: 75%;
padding: 0 1rem 0 0; } padding: 0 1rem 0 0; }
#page-content.blocks-pre .region-main #region-main {
border: 1px solid rgba(0, 0, 0, 0.125);
padding: 1.25rem;
border-radius: 0.25rem; }
#page-content.blocks-post .region-main { #page-content.blocks-post .region-main {
flex: 0 0 75%; flex: 0 0 75%;
max-width: 75%; max-width: 75%;
@ -21485,6 +21498,10 @@ body {
flex: 0 0 80%; flex: 0 0 80%;
max-width: 80%; max-width: 80%;
padding: 0 1rem 0 0; } padding: 0 1rem 0 0; }
#page-content.blocks-pre .region-main #region-main {
border: 1px solid rgba(0, 0, 0, 0.125);
padding: 1.25rem;
border-radius: 0.25rem; }
#page-content.blocks-post .region-main { #page-content.blocks-post .region-main {
flex: 0 0 80%; flex: 0 0 80%;
max-width: 80%; max-width: 80%;

2
theme/classic/templates/footer.mustache
View file

@ -28,7 +28,7 @@
} }
}} }}
<footer id="page-footer" class="py-3 footer-dark bg-dark text-light"> <footer id="page-footer" class="py-3 footer-dark bg-dark text-light">
<div class="container"> <div class="container footer-dark-inner">
<div id="course-footer">{{{ output.course_footer }}}</div> <div id="course-footer">{{{ output.course_footer }}}</div>
{{# output.page_doc_link }} {{# output.page_doc_link }}