L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-88072-main' of https://github.com/laurentdavid/moodle

Browse Source
This commit is contained in:
Amaia Anabitarte
2026-03-13 14:03:04 +01:00
parent 7af4fb348c 2a4f96e628
commit 16fc459834
4 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/course/format/templates/local/content/section/content.mustache
+1 -1
View File
@@ -166,7 +166,7 @@
</div>
<div id="coursecontentcollapseid{{id}}"
class="content {{^iscoursedisplaymultipage}}{{^sitehome}}{{^displayonesection}}course-content-item-content collapse {{^contentcollapsed}}show{{/contentcollapsed}}{{/displayonesection}}{{/sitehome}}{{/iscoursedisplaymultipage}}">
<div class="{{#hasavailability}}description{{/hasavailability}} my-3" data-for="sectioninfo">
<div class="{{#hasavailability}}description{{/hasavailability}}" data-for="sectioninfo">
{{#isstealth}}
<div class="alert alert-warning">
{{#str}} orphansectionwarning, core_courseformat {{/str}}
public/theme/boost/scss/moodle/course.scss
+27 -4
View File
@@ -795,7 +795,7 @@ $divider-hover-color: $primary !default;
margin-top: 0;
.section-item {
border: none;
padding: $activity-item-padding;
padding: $activity-item-padding $activity-item-padding 0;
}
.icons-collapse-expand:has(+ h4) {
height: map-get($iconsizes, 4);
@@ -830,12 +830,31 @@ $divider-hover-color: $primary !default;
.course-content-item-content {
border-bottom: $border-width solid $border-color;
}
.course-section-header {
padding-bottom: map-get($spacers, 3);
}
&:has([data-for="sectiontoggler"].collapsed):not(:has(.course-content-item-content.collapsing)) {
.course-section-header {
border-bottom: $border-width solid $border-color;
}
}
.section .activity:last-child {
border-bottom: none;
}
.course-section-header {
border-bottom: $border-width solid $border-color;
padding-bottom: map-get($spacers, 3);
}
.course-content-item-content > [data-for="sectioninfo"] {
margin: map-get($spacers, 1) 0;
}
.course-content-item-content > [data-for="sectioninfo"]:not(.description) {
margin: 0;
min-height: 0;
}
// No bottom line for the last subsection.
&:last-child .section-item {
.course-content-item-content,
&:has([data-for="sectiontoggler"].collapsed):not(:has(.course-content-item-content.collapsing)) .course-section-header {
border-bottom: none;
}
}
}
@@ -897,6 +916,10 @@ $divider-hover-color: $primary !default;
}
}
[data-for="sectioninfo"] {
margin: map-get($spacers, 3) 0;
}
/* Drag and drop */
// Compensate for the border widths when dropzones are displayed.
public/theme/boost/style/moodle.css
+20 -4
View File
@@ -31132,7 +31132,7 @@ body:not(.editing) .single-section > ul > .course-section .section-item .activit
}
.activity.subsection .section .section-item {
border: none;
padding: 0.75rem;
padding: 0.75rem 0.75rem 0;
}
.activity.subsection .section .icons-collapse-expand:has(+ h4, + .h4) {
height: 24px;
@@ -31160,12 +31160,24 @@ body:not(.editing) .single-section > ul > .course-section .section-item .activit
body:not(.editing) .activity.subsection .section-item .course-content-item-content {
border-bottom: 1px solid #dee2e6;
}
body:not(.editing) .activity.subsection .section-item .course-section-header {
padding-bottom: 1rem;
}
body:not(.editing) .activity.subsection .section-item:has([data-for=sectiontoggler].collapsed):not(:has(.course-content-item-content.collapsing)) .course-section-header {
border-bottom: 1px solid #dee2e6;
}
body:not(.editing) .activity.subsection .section-item .section .activity:last-child {
border-bottom: none;
}
body:not(.editing) .activity.subsection .section-item .course-section-header {
border-bottom: 1px solid #dee2e6;
padding-bottom: 1rem;
body:not(.editing) .activity.subsection .course-content-item-content > [data-for=sectioninfo] {
margin: 0.25rem 0;
}
body:not(.editing) .activity.subsection .course-content-item-content > [data-for=sectioninfo]:not(.description) {
margin: 0;
min-height: 0;
}
body:not(.editing) .activity.subsection:last-child .section-item .course-content-item-content, body:not(.editing) .activity.subsection:last-child .section-item:has([data-for=sectiontoggler].collapsed):not(:has(.course-content-item-content.collapsing)) .course-section-header {
border-bottom: none;
}
/* Spinners */
@@ -31211,6 +31223,10 @@ body:not(.editing) .activity.subsection .section-item .course-section-header {
display: none;
}
[data-for=sectioninfo] {
margin: 1rem 0;
}
/* Drag and drop */
.course-content .section.dropready.main.drop-down {
border-bottom: 1px solid #1d2125;
public/theme/classic/style/moodle.css
+20 -4
View File
@@ -31132,7 +31132,7 @@ body:not(.editing) .single-section > ul > .course-section .section-item .activit
}
.activity.subsection .section .section-item {
border: none;
padding: 0.75rem;
padding: 0.75rem 0.75rem 0;
}
.activity.subsection .section .icons-collapse-expand:has(+ h4, + .h4) {
height: 24px;
@@ -31160,12 +31160,24 @@ body:not(.editing) .single-section > ul > .course-section .section-item .activit
body:not(.editing) .activity.subsection .section-item .course-content-item-content {
border-bottom: 1px solid #dee2e6;
}
body:not(.editing) .activity.subsection .section-item .course-section-header {
padding-bottom: 1rem;
}
body:not(.editing) .activity.subsection .section-item:has([data-for=sectiontoggler].collapsed):not(:has(.course-content-item-content.collapsing)) .course-section-header {
border-bottom: 1px solid #dee2e6;
}
body:not(.editing) .activity.subsection .section-item .section .activity:last-child {
border-bottom: none;
}
body:not(.editing) .activity.subsection .section-item .course-section-header {
border-bottom: 1px solid #dee2e6;
padding-bottom: 1rem;
body:not(.editing) .activity.subsection .course-content-item-content > [data-for=sectioninfo] {
margin: 0.25rem 0;
}
body:not(.editing) .activity.subsection .course-content-item-content > [data-for=sectioninfo]:not(.description) {
margin: 0;
min-height: 0;
}
body:not(.editing) .activity.subsection:last-child .section-item .course-content-item-content, body:not(.editing) .activity.subsection:last-child .section-item:has([data-for=sectiontoggler].collapsed):not(:has(.course-content-item-content.collapsing)) .course-section-header {
border-bottom: none;
}
/* Spinners */
@@ -31211,6 +31223,10 @@ body:not(.editing) .activity.subsection .section-item .course-section-header {
display: none;
}
[data-for=sectioninfo] {
margin: 1rem 0;
}
/* Drag and drop */
.course-content .section.dropready.main.drop-down {
border-bottom: 1px solid #1d2125;