From 195b14b3d9e2da2dae17e2d770d9926f157ecc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Thu, 24 Oct 2024 15:47:10 +0200
Subject: [PATCH] MDL-80303 theme_boost: Remove unused/unneded course SCSS

- Remove unused/unneeded styles in course.scss
- The .activity-wrapper class and its related SCSS styles are not
needed anymore after MDL-77863 was integrated.
---
 .../format/templates/local/content.mustache   |  13 +-
 .../local/content/frontpagesection.mustache   |   2 +-
 .../templates/local/content/section.mustache  |   3 +-
 .../local/content/section/cmitem.mustache     |   2 +-
 theme/boost/scss/moodle/course.scss           | 437 ++----------------
 theme/boost/style/moodle.css                  | 363 ++-------------
 theme/classic/style/moodle.css                | 363 ++-------------
 7 files changed, 134 insertions(+), 1049 deletions(-)

diff --git a/course/format/templates/local/content.mustache b/course/format/templates/local/content.mustache
index 9d9336c865872..0dd3cdb861834 100644
--- a/course/format/templates/local/content.mustache
+++ b/course/format/templates/local/content.mustache
@@ -53,7 +53,8 @@
                 "id": 35,
                 "header": {
                     "name": "Section title",
-                    "url": "#"
+                    "url": "#",
+                    "headinglevel": 3
                 },
                 "cmlist": {
                     "cms": [
@@ -83,7 +84,8 @@
                 "id": 36,
                 "header": {
                     "name": "Section 2 title",
-                    "url": "#"
+                    "url": "#",
+                    "headinglevel": 3
                 },
                 "cmlist": {
                     "cms": [
@@ -139,7 +141,8 @@
             "id": 37,
             "header": {
                 "name": "Single Section Example",
-                "url": "#"
+                "url": "#",
+                "headinglevel": 3
             },
             "cmlist": {
                 "cms": [
@@ -169,7 +172,7 @@
 <div id="course-format-{{uniqid}}">
     <h2 class="accesshide">{{{title}}}</h2>
     {{{completionhelp}}}
-    <ul class="{{format}}" data-for="course_sectionlist">
+    <ul class="{{format}} section-list" data-for="course_sectionlist">
         {{#initialsection}}
             {{$ core_courseformat/local/content/section }}
                 {{> core_courseformat/local/content/section }}
@@ -188,7 +191,7 @@
                 {{> core_courseformat/local/content/sectionnavigation }}
             {{/ core_courseformat/local/content/sectionnavigation }}
         {{/sectionnavigation}}
-        <ul class="{{format}}">
+        <ul class="{{format}} section-list">
         {{#singlesection}}
             {{$ core_courseformat/local/content/section }}
                 {{> core_courseformat/local/content/section }}
diff --git a/course/format/templates/local/content/frontpagesection.mustache b/course/format/templates/local/content/frontpagesection.mustache
index 18d7106eca8b8..4d3781cce20ff 100644
--- a/course/format/templates/local/content/frontpagesection.mustache
+++ b/course/format/templates/local/content/frontpagesection.mustache
@@ -38,7 +38,7 @@
     </div>
     {{/showsettings}}
     <div class="sitetopic">
-        <ul class="topics frontpage" data-for="course_sectionlist">
+        <ul class="topics section-list frontpage" data-for="course_sectionlist">
             {{#sections}}
                 {{> core_courseformat/local/content/section }}
             {{/sections}}
diff --git a/course/format/templates/local/content/section.mustache b/course/format/templates/local/content/section.mustache
index 110eed2ca26e0..4138fd2116f1b 100644
--- a/course/format/templates/local/content/section.mustache
+++ b/course/format/templates/local/content/section.mustache
@@ -32,7 +32,8 @@
             "name": "Section title",
             "title": "<a href=\"http://moodle/course/view.php?id=5#section-0\">Section title</a>",
             "url": "#",
-            "ishidden": true
+            "ishidden": true,
+            "headinglevel": 3
         },
         "cmlist": {
             "cms": [
diff --git a/course/format/templates/local/content/section/cmitem.mustache b/course/format/templates/local/content/section/cmitem.mustache
index be1cba56a308c..f95bacb4e36a7 100644
--- a/course/format/templates/local/content/section/cmitem.mustache
+++ b/course/format/templates/local/content/section/cmitem.mustache
@@ -39,7 +39,7 @@
     }
 }}
 <li
-    class="activity activity-wrapper {{module}} modtype_{{module}} {{extraclasses}} {{#hasinfo}}hasinfo{{/hasinfo}} {{#indent}}indented{{/indent}}"
+    class="activity {{module}} modtype_{{module}} {{extraclasses}} {{#hasinfo}}hasinfo{{/hasinfo}} {{#indent}}indented{{/indent}}"
     id="{{anchor}}"
     data-for="cmitem"
     data-id="{{id}}"
diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index c0ff0c701edde..b3fd0b15866a4 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -2,134 +2,9 @@
  * Course page styles.
  */
 
-.section {
-    .side {
-        &.left {
-            float: left;
-        }
-
-        &.right {
-            float: right;
-            clear: right;
-        }
-        margin-top: 0.5rem;
-    }
-
-    .spinner {
-        height: 16px;
-        width: 16px;
-    }
-
-    .activity {
-        .spinner {
-            left: 100%;
-            position: absolute;
-        }
-
-        /* The command block for each activity */
-        .actions {
-            position: absolute;
-            right: 0;
-            top: 0;
-            display: flex;
-        }
-
-        .contentwithoutlink,
-        .activityinstance {
-            min-width: 40%;
-
-            > a {
-                display: inline-flex;
-                align-items: center;
-            }
-
-            .dimmed {
-                .activityicon {
-                    opacity: .5;
-                }
-            }
-        }
-
-        .stealth {
-            color: $text-muted;
-        }
-        a.stealth,
-        a.stealth:hover {
-            color: lighten($link-color, 25%) !important; /* stylelint-disable-line declaration-no-important */
-        }
-
-        &.indented {
-            .activity-item {
-                margin-left: map-get($spacers, 3);
-            }
-        }
-    }
-
-    .label {
-        .contentwithoutlink,
-        .activityinstance {
-            padding-right: 32px;
-            display: block;
-            height: inherit;
-        }
-        @include media-breakpoint-up(sm) {
-            .mod-indent-outer {
-                padding-left: 24px;
-                display: block;
-            }
-        }
-    }
-
-    .filler {
-        // This must be sized like an icon to fill the space.
-        width: 16px;
-        height: 16px;
-        padding: 0;
-        margin: 0 ($spacer * 0.5);
-        display: inline-block;
-    }
-
-    .activity.editor_displayed {
-        a.editing_title,
-        .moodle-actionmenu {
-            display: none;
-        }
-
-        div.activityinstance {
-            padding-right: initial;
-
-            input {
-                margin-bottom: initial;
-                padding-top: initial;
-                padding-bottom: initial;
-                vertical-align: text-bottom;
-            }
-        }
-    }
-}
-
-.section .activity .activityinstance {
-    display: inline-flex;
-    align-items: center;
-    margin-bottom: 1rem;
-}
+/* Spinners */
 
 .editing {
-    .section {
-        .activity {
-            .contentwithoutlink,
-            .activityinstance {
-                padding-right: 200px;
-            }
-            .mod-indent-outer {
-                /**
-                 * Add appropriate padding such that nothing overlaps the
-                 * absolute positioned move icon.
-                 */
-                padding-left: 2rem;
-            }
-        }
-    }
     // Remove old spinners if the reactive state is ready.
     .course-content .stateready .section .spinner {
         display: none;
@@ -186,52 +61,7 @@
     }
 }
 
-.editing_show + .editing_assign,
-.editing_hide + .editing_assign {
-    // if roles icon missing, add space
-    margin-left: 20px;
-}
-
-.section .activity .commands {
-    white-space: nowrap;
-    display: inline-block;
-}
-
-.section .activity.modtype_label.label {
-    font-weight: normal;
-
-    // Remove min-height for labels so top and bottom paddings can be displayed more consistently.
-    .contentwithoutlink {
-        min-height: 0;
-    }
-
-    // When activity information is shown remove the bottom margin for the last p/i elements.
-    &.hasinfo {
-        p:last-child,
-        i:last-child {
-            margin-bottom: 0;
-        }
-    }
-}
-
-// The activity-wrapper class ensures these styles are not used when the new activity styles
-// from MDL-71691 are not affected. As soons as MDL-72656 is integrated and these styles
-// are removed the core_courseformat/local/content/cm template no longer needs this class.
-.section li.activity:not(.activity-wrapper) {
-    padding: 0.2em;
-    clear: both;
-
-    &.hasinfo {
-        border-bottom: $border-width solid $table-border-color;
-        padding-top: map-get($spacers, 3);
-        padding-bottom: map-get($spacers, 3);
-
-        &:last-child {
-            border-bottom: 0;
-            padding-bottom: 0;
-        }
-    }
-}
+/* Drag and drop */
 
 // Compensate for the border widths when dropzones are displayed.
 .course-content .section.dropready {
@@ -266,27 +96,8 @@
     }
 }
 
-.section .activity .activityinstance .groupinglabel {
-    padding-left: 30px;
-}
-
-.section.main:not(.course-section) .activity .availabilityinfo,
-.section.main:not(.course-section) .activity .contentafterlink {
-    margin-top: 0.5em;
-    margin-left: 30px;
-}
-
-.section .activity .contentafterlink p {
-    margin: .5em 0;
-}
-
-.editing .section.main:not(.course-section) {
-    .activity:hover,
-    .activity.action-menu-shown,
-    .sectionname:hover {
-        background-color: $table-accent-bg;
-    }
-}
+/* Highlight current section */
+// TODO: Move to "Section" block.
 
 .course-content .current {
     position: relative;
@@ -301,203 +112,6 @@
     top: 0;
 }
 
-.course-content ul li.section.hidden:not(.course-section) {
-    .sectionname > span,
-    .content > div.summary,
-    .activity .activityinstance {
-        color: $text-muted;
-    }
-}
-
-.course-content ul.topics,
-.course-content ul.weeks {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-
-    li.section {
-        .content {
-            margin: 0;
-            padding: 0;
-        }
-
-        @include media-breakpoint-up(sm) {
-            .summary,
-            .content > .availabilityinfo {
-                margin-left: 25px;
-            }
-        }
-
-        .left,
-        .right {
-            padding: 0 6px 0;
-            text-align: right;
-            width: auto;
-        }
-    }
-}
-
-.course-content .single-section ul.topics li.section,
-.course-content .single-section ul.weeks li.section {
-    padding-top: 0;
-}
-
-@include media-breakpoint-down(sm) {
-    body:not(.editing) {
-        .course-content ul.topics,
-        .course-content ul.weeks {
-            li.section {
-                .left,
-                .right {
-                    display: none;
-                }
-            }
-        }
-    }
-}
-
-.course-content {
-    margin-top: 0;
-}
-
-.course-content .hidden {
-    display: none;
-}
-
-.course-content li {
-    &.section:not(.course-section) {
-        @include media-breakpoint-down(sm) {
-            ul {
-                padding-left: 0;
-            }
-        }
-        ul {
-            list-style: disc;
-
-            ul {
-                list-style: circle;
-
-                ul {
-                    list-style: square;
-                }
-            }
-        }
-
-        li {
-            &.activity {
-                ul {
-                    list-style: disc;
-
-                    ul {
-                        list-style: circle;
-
-                        ul {
-                            list-style: square;
-                        }
-                    }
-                }
-            }
-        }
-
-        .right {
-            > .icon:first-child {
-                /* Remove the spacer icon. */
-                display: none;
-            }
-        }
-    }
-}
-
-.path-course-view.editing #region-main > .card-block {
-    padding-bottom: 13rem;
-}
-
-.path-course-view .completionprogress {
-    margin-left: 25px;
-}
-
-.path-course-view .completionprogress {
-    display: block;
-    float: right;
-    height: 20px;
-    position: relative;
-}
-
-#page-site-index .subscribelink {
-    text-align: right;
-}
-
-#site-news-forum h2,
-#frontpage-course-list h2,
-#frontpage-category-names h2,
-#frontpage-category-combo h2 {
-    margin-bottom: 9px;
-}
-
-.path-course-view a.reduce-sections {
-    padding-left: 0.2em;
-}
-
-.path-course-view .subscribelink {
-    text-align: right;
-}
-
-.path-course-view .unread {
-    margin-left: 30px;
-}
-
-.path-course-view .block.drag .header {
-    cursor: move;
-}
-
-.path-course-view .completionprogress {
-    text-align: right;
-}
-
-.path-course-view .single-section .completionprogress {
-    margin-right: 5px;
-}
-
-.path-course-view li.activity span.autocompletion img {
-    vertical-align: text-bottom;
-    margin-left: 0;
-}
-
-.path-course-view {
-    &.editing {
-        li.activity span.autocompletion img {
-            /* Use the same spacing as the filler. */
-            margin-right: $spacer * 0.5;
-            margin-left: $spacer * 0.5;
-        }
-    }
-}
-
-li.section.hidden span.commands a.editing_hide,
-li.section.hidden span.commands a.editing_show {
-    cursor: default;
-}
-
-.single-section-page .header-action {
-    display: inline-block;
-}
-
-input.titleeditor {
-    width: 330px;
-    vertical-align: text-bottom;
-}
-
-.automatic-completion-conditions {
-    .badge {
-        font-size: 100%;
-    }
-}
-
-// These are the new styles for the renewed course UI in isssue MDL-71691
-// once the old course renderers are removed in MDL-72656, all css related
-// to activities and sections above this commend needs to be reviewed an
-// possibly removed.
-
 /* Variables definition*/
 
 $activity-item-padding: 0.75rem !default;
@@ -555,6 +169,12 @@ $divider-hover-color: $primary !default;
     }
 }
 
+/* Course content */
+
+.course-content ul.section-list {
+    padding: 0;
+}
+
 /* Course section */
 
 .course-section {
@@ -707,8 +327,18 @@ $divider-hover-color: $primary !default;
     }
 }
 
+.single-section-page .header-action {
+    display: inline-block;
+}
+
+.course-content .single-section ul.topics li.section,
+.course-content .single-section ul.weeks li.section {
+    padding-top: 0;
+}
+
 /* Re-style ordered list in course content */
-.course-content .activity-altcontent {
+.course-content .section-item,
+.course-content .section-item .activity-item {
     ul {
         list-style: disc;
         ul {
@@ -727,6 +357,11 @@ $divider-hover-color: $primary !default;
     padding-top: map-get($spacers, 1);
     margin-top: map-get($spacers, 1);
     border-top: $border-width solid $border-color;
+    &.indented {
+        .activity-item {
+            margin-left: map-get($spacers, 3);
+        }
+    }
     // Custom styles for activity while editing and for the first activity card in the section.
     .editing &,
     .section &:first-child {
@@ -1171,16 +806,28 @@ $divider-hover-color: $primary !default;
 /* Home page course specific styles */
 
 .sitetopic {
-    // Hide the first activity top border.
-    .activity:first-of-type hr {
-        display: none;
-    }
     .section-item {
         margin-bottom: map-get($spacers, 4);
         @include border-radius();
     }
 }
 
+#page-site-index .subscribelink {
+    text-align: right;
+}
+
+.path-course-view {
+    .subscribelink {
+        text-align: right;
+    }
+    .unread {
+        margin-left: 30px;
+    }
+    .block.drag .header {
+        cursor: move;
+    }
+}
+
 /* Styles for the Move activity and Move section modals */
 
 .move-activity-tree {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 52baeb1138065..2f6e5465ba4f0 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -28128,106 +28128,7 @@ table.calendartable caption {
 /*
  * Course page styles.
  */
-.section .side {
-  margin-top: 0.5rem;
-}
-.section .side.left {
-  float: left;
-}
-.section .side.right {
-  float: right;
-  clear: right;
-}
-.section .spinner {
-  height: 16px;
-  width: 16px;
-}
-.section .activity {
-  /* The command block for each activity */
-}
-.section .activity .spinner {
-  left: 100%;
-  position: absolute;
-}
-.section .activity .actions {
-  position: absolute;
-  right: 0;
-  top: 0;
-  display: flex;
-}
-.section .activity .contentwithoutlink,
-.section .activity .activityinstance {
-  min-width: 40%;
-}
-.section .activity .contentwithoutlink > a,
-.section .activity .activityinstance > a {
-  display: inline-flex;
-  align-items: center;
-}
-.section .activity .contentwithoutlink .dimmed .activityicon,
-.section .activity .activityinstance .dimmed .activityicon {
-  opacity: 0.5;
-}
-.section .activity .stealth {
-  color: #6a737b;
-}
-.section .activity a.stealth,
-.section .activity a.stealth:hover {
-  color: #5babf2 !important; /* stylelint-disable-line declaration-no-important */
-}
-.section .activity.indented .activity-item {
-  margin-left: 1rem;
-}
-.section .label .contentwithoutlink,
-.section .label .activityinstance {
-  padding-right: 32px;
-  display: block;
-  height: inherit;
-}
-@media (min-width: 576px) {
-  .section .label .mod-indent-outer {
-    padding-left: 24px;
-    display: block;
-  }
-}
-.section .filler {
-  width: 16px;
-  height: 16px;
-  padding: 0;
-  margin: 0 0.5rem;
-  display: inline-block;
-}
-.section .activity.editor_displayed a.editing_title,
-.section .activity.editor_displayed .moodle-actionmenu {
-  display: none;
-}
-.section .activity.editor_displayed div.activityinstance {
-  padding-right: initial;
-}
-.section .activity.editor_displayed div.activityinstance input {
-  margin-bottom: initial;
-  padding-top: initial;
-  padding-bottom: initial;
-  vertical-align: text-bottom;
-}
-
-.section .activity .activityinstance {
-  display: inline-flex;
-  align-items: center;
-  margin-bottom: 1rem;
-}
-
-.editing .section .activity .contentwithoutlink,
-.editing .section .activity .activityinstance {
-  padding-right: 200px;
-}
-.editing .section .activity .mod-indent-outer {
-  /**
-   * Add appropriate padding such that nothing overlaps the
-   * absolute positioned move icon.
-   */
-  padding-left: 2rem;
-}
+/* Spinners */
 .editing .course-content .stateready .section .spinner {
   display: none;
 }
@@ -28272,41 +28173,7 @@ table.calendartable caption {
     transform: rotate(359deg);
   }
 }
-.editing_show + .editing_assign,
-.editing_hide + .editing_assign {
-  margin-left: 20px;
-}
-
-.section .activity .commands {
-  white-space: nowrap;
-  display: inline-block;
-}
-
-.section .activity.modtype_label.label {
-  font-weight: normal;
-}
-.section .activity.modtype_label.label .contentwithoutlink {
-  min-height: 0;
-}
-.section .activity.modtype_label.label.hasinfo p:last-child,
-.section .activity.modtype_label.label.hasinfo i:last-child {
-  margin-bottom: 0;
-}
-
-.section li.activity:not(.activity-wrapper) {
-  padding: 0.2em;
-  clear: both;
-}
-.section li.activity:not(.activity-wrapper).hasinfo {
-  border-bottom: 1px solid #dee2e6;
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-}
-.section li.activity:not(.activity-wrapper).hasinfo:last-child {
-  border-bottom: 0;
-  padding-bottom: 0;
-}
-
+/* Drag and drop */
 .course-content .section.dropready.main.drop-down {
   border-bottom: 1px solid #1d2125;
 }
@@ -28328,26 +28195,7 @@ table.calendartable caption {
   margin-top: -1px;
 }
 
-.section .activity .activityinstance .groupinglabel {
-  padding-left: 30px;
-}
-
-.section.main:not(.course-section) .activity .availabilityinfo,
-.section.main:not(.course-section) .activity .contentafterlink {
-  margin-top: 0.5em;
-  margin-left: 30px;
-}
-
-.section .activity .contentafterlink p {
-  margin: 0.5em 0;
-}
-
-.editing .section.main:not(.course-section) .activity:hover,
-.editing .section.main:not(.course-section) .activity.action-menu-shown,
-.editing .section.main:not(.course-section) .sectionname:hover {
-  background-color: rgba(0, 0, 0, 0.03);
-}
-
+/* Highlight current section */
 .course-content .current {
   position: relative;
 }
@@ -28361,168 +28209,6 @@ table.calendartable caption {
   top: 0;
 }
 
-.course-content ul li.section.hidden:not(.course-section) .sectionname > span,
-.course-content ul li.section.hidden:not(.course-section) .content > div.summary,
-.course-content ul li.section.hidden:not(.course-section) .activity .activityinstance {
-  color: #6a737b;
-}
-
-.course-content ul.topics,
-.course-content ul.weeks {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-.course-content ul.topics li.section .content,
-.course-content ul.weeks li.section .content {
-  margin: 0;
-  padding: 0;
-}
-@media (min-width: 576px) {
-  .course-content ul.topics li.section .summary,
-  .course-content ul.topics li.section .content > .availabilityinfo,
-  .course-content ul.weeks li.section .summary,
-  .course-content ul.weeks li.section .content > .availabilityinfo {
-    margin-left: 25px;
-  }
-}
-.course-content ul.topics li.section .left,
-.course-content ul.topics li.section .right,
-.course-content ul.weeks li.section .left,
-.course-content ul.weeks li.section .right {
-  padding: 0 6px 0;
-  text-align: right;
-  width: auto;
-}
-
-.course-content .single-section ul.topics li.section,
-.course-content .single-section ul.weeks li.section {
-  padding-top: 0;
-}
-
-@media (max-width: 767.98px) {
-  body:not(.editing) .course-content ul.topics li.section .left,
-  body:not(.editing) .course-content ul.topics li.section .right,
-  body:not(.editing) .course-content ul.weeks li.section .left,
-  body:not(.editing) .course-content ul.weeks li.section .right {
-    display: none;
-  }
-}
-.course-content {
-  margin-top: 0;
-}
-
-.course-content .hidden {
-  display: none;
-}
-
-@media (max-width: 767.98px) {
-  .course-content li.section:not(.course-section) ul {
-    padding-left: 0;
-  }
-}
-.course-content li.section:not(.course-section) ul {
-  list-style: disc;
-}
-.course-content li.section:not(.course-section) ul ul {
-  list-style: circle;
-}
-.course-content li.section:not(.course-section) ul ul ul {
-  list-style: square;
-}
-.course-content li.section:not(.course-section) li.activity ul {
-  list-style: disc;
-}
-.course-content li.section:not(.course-section) li.activity ul ul {
-  list-style: circle;
-}
-.course-content li.section:not(.course-section) li.activity ul ul ul {
-  list-style: square;
-}
-.course-content li.section:not(.course-section) .right > .icon:first-child {
-  /* Remove the spacer icon. */
-  display: none;
-}
-
-.path-course-view.editing #region-main > .card-block {
-  padding-bottom: 13rem;
-}
-
-.path-course-view .completionprogress {
-  margin-left: 25px;
-}
-
-.path-course-view .completionprogress {
-  display: block;
-  float: right;
-  height: 20px;
-  position: relative;
-}
-
-#page-site-index .subscribelink {
-  text-align: right;
-}
-
-#site-news-forum h2,
-#frontpage-course-list h2,
-#frontpage-category-names h2,
-#frontpage-category-combo h2 {
-  margin-bottom: 9px;
-}
-
-.path-course-view a.reduce-sections {
-  padding-left: 0.2em;
-}
-
-.path-course-view .subscribelink {
-  text-align: right;
-}
-
-.path-course-view .unread {
-  margin-left: 30px;
-}
-
-.path-course-view .block.drag .header {
-  cursor: move;
-}
-
-.path-course-view .completionprogress {
-  text-align: right;
-}
-
-.path-course-view .single-section .completionprogress {
-  margin-right: 5px;
-}
-
-.path-course-view li.activity span.autocompletion img {
-  vertical-align: text-bottom;
-  margin-left: 0;
-}
-
-.path-course-view.editing li.activity span.autocompletion img {
-  /* Use the same spacing as the filler. */
-  margin-right: 0.5rem;
-  margin-left: 0.5rem;
-}
-
-li.section.hidden span.commands a.editing_hide,
-li.section.hidden span.commands a.editing_show {
-  cursor: default;
-}
-
-.single-section-page .header-action {
-  display: inline-block;
-}
-
-input.titleeditor {
-  width: 330px;
-  vertical-align: text-bottom;
-}
-
-.automatic-completion-conditions .badge {
-  font-size: 100%;
-}
-
 /* Variables definition*/
 /* Functions/Mixins definition */
 /* Section Expand all/Collapse all */
@@ -28539,6 +28225,11 @@ input.titleeditor {
   display: block;
 }
 
+/* Course content */
+.course-content ul.section-list {
+  padding: 0;
+}
+
 /* Course section */
 .course-section {
   list-style: none;
@@ -28651,14 +28342,26 @@ input.titleeditor {
   border: none;
 }
 
+.single-section-page .header-action {
+  display: inline-block;
+}
+
+.course-content .single-section ul.topics li.section,
+.course-content .single-section ul.weeks li.section {
+  padding-top: 0;
+}
+
 /* Re-style ordered list in course content */
-.course-content .activity-altcontent ul {
+.course-content .section-item ul,
+.course-content .section-item .activity-item ul {
   list-style: disc;
 }
-.course-content .activity-altcontent ul ul {
+.course-content .section-item ul ul,
+.course-content .section-item .activity-item ul ul {
   list-style: circle;
 }
-.course-content .activity-altcontent ul ul ul {
+.course-content .section-item ul ul ul,
+.course-content .section-item .activity-item ul ul ul {
   list-style: square;
 }
 
@@ -28669,6 +28372,9 @@ input.titleeditor {
   margin-top: 0.25rem;
   border-top: 1px solid #dee2e6;
 }
+.activity.indented .activity-item {
+  margin-left: 1rem;
+}
 .editing .activity, .section .activity:first-child {
   padding-top: 0;
   margin-top: 0;
@@ -29450,14 +29156,25 @@ input.titleeditor {
 }
 
 /* Home page course specific styles */
-.sitetopic .activity:first-of-type hr {
-  display: none;
-}
 .sitetopic .section-item {
   margin-bottom: 1.5rem;
   border-radius: 0.5rem;
 }
 
+#page-site-index .subscribelink {
+  text-align: right;
+}
+
+.path-course-view .subscribelink {
+  text-align: right;
+}
+.path-course-view .unread {
+  margin-left: 30px;
+}
+.path-course-view .block.drag .header {
+  cursor: move;
+}
+
 /* Styles for the Move activity and Move section modals */
 .move-activity-tree .collapse-list-item {
   border-radius: 0.5rem;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index f4c54daaaa5e8..0707e6c31052b 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -28128,106 +28128,7 @@ table.calendartable caption {
 /*
  * Course page styles.
  */
-.section .side {
-  margin-top: 0.5rem;
-}
-.section .side.left {
-  float: left;
-}
-.section .side.right {
-  float: right;
-  clear: right;
-}
-.section .spinner {
-  height: 16px;
-  width: 16px;
-}
-.section .activity {
-  /* The command block for each activity */
-}
-.section .activity .spinner {
-  left: 100%;
-  position: absolute;
-}
-.section .activity .actions {
-  position: absolute;
-  right: 0;
-  top: 0;
-  display: flex;
-}
-.section .activity .contentwithoutlink,
-.section .activity .activityinstance {
-  min-width: 40%;
-}
-.section .activity .contentwithoutlink > a,
-.section .activity .activityinstance > a {
-  display: inline-flex;
-  align-items: center;
-}
-.section .activity .contentwithoutlink .dimmed .activityicon,
-.section .activity .activityinstance .dimmed .activityicon {
-  opacity: 0.5;
-}
-.section .activity .stealth {
-  color: #6a737b;
-}
-.section .activity a.stealth,
-.section .activity a.stealth:hover {
-  color: #5babf2 !important; /* stylelint-disable-line declaration-no-important */
-}
-.section .activity.indented .activity-item {
-  margin-left: 1rem;
-}
-.section .label .contentwithoutlink,
-.section .label .activityinstance {
-  padding-right: 32px;
-  display: block;
-  height: inherit;
-}
-@media (min-width: 576px) {
-  .section .label .mod-indent-outer {
-    padding-left: 24px;
-    display: block;
-  }
-}
-.section .filler {
-  width: 16px;
-  height: 16px;
-  padding: 0;
-  margin: 0 0.5rem;
-  display: inline-block;
-}
-.section .activity.editor_displayed a.editing_title,
-.section .activity.editor_displayed .moodle-actionmenu {
-  display: none;
-}
-.section .activity.editor_displayed div.activityinstance {
-  padding-right: initial;
-}
-.section .activity.editor_displayed div.activityinstance input {
-  margin-bottom: initial;
-  padding-top: initial;
-  padding-bottom: initial;
-  vertical-align: text-bottom;
-}
-
-.section .activity .activityinstance {
-  display: inline-flex;
-  align-items: center;
-  margin-bottom: 1rem;
-}
-
-.editing .section .activity .contentwithoutlink,
-.editing .section .activity .activityinstance {
-  padding-right: 200px;
-}
-.editing .section .activity .mod-indent-outer {
-  /**
-   * Add appropriate padding such that nothing overlaps the
-   * absolute positioned move icon.
-   */
-  padding-left: 2rem;
-}
+/* Spinners */
 .editing .course-content .stateready .section .spinner {
   display: none;
 }
@@ -28272,41 +28173,7 @@ table.calendartable caption {
     transform: rotate(359deg);
   }
 }
-.editing_show + .editing_assign,
-.editing_hide + .editing_assign {
-  margin-left: 20px;
-}
-
-.section .activity .commands {
-  white-space: nowrap;
-  display: inline-block;
-}
-
-.section .activity.modtype_label.label {
-  font-weight: normal;
-}
-.section .activity.modtype_label.label .contentwithoutlink {
-  min-height: 0;
-}
-.section .activity.modtype_label.label.hasinfo p:last-child,
-.section .activity.modtype_label.label.hasinfo i:last-child {
-  margin-bottom: 0;
-}
-
-.section li.activity:not(.activity-wrapper) {
-  padding: 0.2em;
-  clear: both;
-}
-.section li.activity:not(.activity-wrapper).hasinfo {
-  border-bottom: 1px solid #dee2e6;
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-}
-.section li.activity:not(.activity-wrapper).hasinfo:last-child {
-  border-bottom: 0;
-  padding-bottom: 0;
-}
-
+/* Drag and drop */
 .course-content .section.dropready.main.drop-down {
   border-bottom: 1px solid #1d2125;
 }
@@ -28328,26 +28195,7 @@ table.calendartable caption {
   margin-top: -1px;
 }
 
-.section .activity .activityinstance .groupinglabel {
-  padding-left: 30px;
-}
-
-.section.main:not(.course-section) .activity .availabilityinfo,
-.section.main:not(.course-section) .activity .contentafterlink {
-  margin-top: 0.5em;
-  margin-left: 30px;
-}
-
-.section .activity .contentafterlink p {
-  margin: 0.5em 0;
-}
-
-.editing .section.main:not(.course-section) .activity:hover,
-.editing .section.main:not(.course-section) .activity.action-menu-shown,
-.editing .section.main:not(.course-section) .sectionname:hover {
-  background-color: rgba(0, 0, 0, 0.03);
-}
-
+/* Highlight current section */
 .course-content .current {
   position: relative;
 }
@@ -28361,168 +28209,6 @@ table.calendartable caption {
   top: 0;
 }
 
-.course-content ul li.section.hidden:not(.course-section) .sectionname > span,
-.course-content ul li.section.hidden:not(.course-section) .content > div.summary,
-.course-content ul li.section.hidden:not(.course-section) .activity .activityinstance {
-  color: #6a737b;
-}
-
-.course-content ul.topics,
-.course-content ul.weeks {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-.course-content ul.topics li.section .content,
-.course-content ul.weeks li.section .content {
-  margin: 0;
-  padding: 0;
-}
-@media (min-width: 576px) {
-  .course-content ul.topics li.section .summary,
-  .course-content ul.topics li.section .content > .availabilityinfo,
-  .course-content ul.weeks li.section .summary,
-  .course-content ul.weeks li.section .content > .availabilityinfo {
-    margin-left: 25px;
-  }
-}
-.course-content ul.topics li.section .left,
-.course-content ul.topics li.section .right,
-.course-content ul.weeks li.section .left,
-.course-content ul.weeks li.section .right {
-  padding: 0 6px 0;
-  text-align: right;
-  width: auto;
-}
-
-.course-content .single-section ul.topics li.section,
-.course-content .single-section ul.weeks li.section {
-  padding-top: 0;
-}
-
-@media (max-width: 767.98px) {
-  body:not(.editing) .course-content ul.topics li.section .left,
-  body:not(.editing) .course-content ul.topics li.section .right,
-  body:not(.editing) .course-content ul.weeks li.section .left,
-  body:not(.editing) .course-content ul.weeks li.section .right {
-    display: none;
-  }
-}
-.course-content {
-  margin-top: 0;
-}
-
-.course-content .hidden {
-  display: none;
-}
-
-@media (max-width: 767.98px) {
-  .course-content li.section:not(.course-section) ul {
-    padding-left: 0;
-  }
-}
-.course-content li.section:not(.course-section) ul {
-  list-style: disc;
-}
-.course-content li.section:not(.course-section) ul ul {
-  list-style: circle;
-}
-.course-content li.section:not(.course-section) ul ul ul {
-  list-style: square;
-}
-.course-content li.section:not(.course-section) li.activity ul {
-  list-style: disc;
-}
-.course-content li.section:not(.course-section) li.activity ul ul {
-  list-style: circle;
-}
-.course-content li.section:not(.course-section) li.activity ul ul ul {
-  list-style: square;
-}
-.course-content li.section:not(.course-section) .right > .icon:first-child {
-  /* Remove the spacer icon. */
-  display: none;
-}
-
-.path-course-view.editing #region-main > .card-block {
-  padding-bottom: 13rem;
-}
-
-.path-course-view .completionprogress {
-  margin-left: 25px;
-}
-
-.path-course-view .completionprogress {
-  display: block;
-  float: right;
-  height: 20px;
-  position: relative;
-}
-
-#page-site-index .subscribelink {
-  text-align: right;
-}
-
-#site-news-forum h2,
-#frontpage-course-list h2,
-#frontpage-category-names h2,
-#frontpage-category-combo h2 {
-  margin-bottom: 9px;
-}
-
-.path-course-view a.reduce-sections {
-  padding-left: 0.2em;
-}
-
-.path-course-view .subscribelink {
-  text-align: right;
-}
-
-.path-course-view .unread {
-  margin-left: 30px;
-}
-
-.path-course-view .block.drag .header {
-  cursor: move;
-}
-
-.path-course-view .completionprogress {
-  text-align: right;
-}
-
-.path-course-view .single-section .completionprogress {
-  margin-right: 5px;
-}
-
-.path-course-view li.activity span.autocompletion img {
-  vertical-align: text-bottom;
-  margin-left: 0;
-}
-
-.path-course-view.editing li.activity span.autocompletion img {
-  /* Use the same spacing as the filler. */
-  margin-right: 0.5rem;
-  margin-left: 0.5rem;
-}
-
-li.section.hidden span.commands a.editing_hide,
-li.section.hidden span.commands a.editing_show {
-  cursor: default;
-}
-
-.single-section-page .header-action {
-  display: inline-block;
-}
-
-input.titleeditor {
-  width: 330px;
-  vertical-align: text-bottom;
-}
-
-.automatic-completion-conditions .badge {
-  font-size: 100%;
-}
-
 /* Variables definition*/
 /* Functions/Mixins definition */
 /* Section Expand all/Collapse all */
@@ -28539,6 +28225,11 @@ input.titleeditor {
   display: block;
 }
 
+/* Course content */
+.course-content ul.section-list {
+  padding: 0;
+}
+
 /* Course section */
 .course-section {
   list-style: none;
@@ -28651,14 +28342,26 @@ input.titleeditor {
   border: none;
 }
 
+.single-section-page .header-action {
+  display: inline-block;
+}
+
+.course-content .single-section ul.topics li.section,
+.course-content .single-section ul.weeks li.section {
+  padding-top: 0;
+}
+
 /* Re-style ordered list in course content */
-.course-content .activity-altcontent ul {
+.course-content .section-item ul,
+.course-content .section-item .activity-item ul {
   list-style: disc;
 }
-.course-content .activity-altcontent ul ul {
+.course-content .section-item ul ul,
+.course-content .section-item .activity-item ul ul {
   list-style: circle;
 }
-.course-content .activity-altcontent ul ul ul {
+.course-content .section-item ul ul ul,
+.course-content .section-item .activity-item ul ul ul {
   list-style: square;
 }
 
@@ -28669,6 +28372,9 @@ input.titleeditor {
   margin-top: 0.25rem;
   border-top: 1px solid #dee2e6;
 }
+.activity.indented .activity-item {
+  margin-left: 1rem;
+}
 .editing .activity, .section .activity:first-child {
   padding-top: 0;
   margin-top: 0;
@@ -29450,14 +29156,25 @@ input.titleeditor {
 }
 
 /* Home page course specific styles */
-.sitetopic .activity:first-of-type hr {
-  display: none;
-}
 .sitetopic .section-item {
   margin-bottom: 1.5rem;
   border-radius: 0.25rem;
 }
 
+#page-site-index .subscribelink {
+  text-align: right;
+}
+
+.path-course-view .subscribelink {
+  text-align: right;
+}
+.path-course-view .unread {
+  margin-left: 30px;
+}
+.path-course-view .block.drag .header {
+  cursor: move;
+}
+
 /* Styles for the Move activity and Move section modals */
 .move-activity-tree .collapse-list-item {
   border-radius: 0.25rem;