From 64de4decedb78e5b2fa972268698d83c989fa7ef Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 31 Mar 2020 11:04:45 +0200 Subject: [PATCH] MDL-68301 theme_boost: move course format css this reduces duplication of css in format_topic and format_weeks --- course/format/topics/styles.css | 34 ----------------------------- course/format/weeks/styles.css | 34 ----------------------------- theme/boost/scss/moodle/course.scss | 13 +++++------ theme/boost/style/moodle.css | 17 ++++++++------- theme/classic/style/moodle.css | 17 ++++++++------- 5 files changed, 24 insertions(+), 91 deletions(-) delete mode 100644 course/format/topics/styles.css delete mode 100644 course/format/weeks/styles.css diff --git a/course/format/topics/styles.css b/course/format/topics/styles.css deleted file mode 100644 index 319e883206a..00000000000 --- a/course/format/topics/styles.css +++ /dev/null @@ -1,34 +0,0 @@ -.course-content ul.topics { - margin: 0; - list-style: none; -} - -.course-content ul.topics li.section .content { - margin: 0 40px; -} - -.course-content ul.topics li.section .left, -.course-content ul.topics li.section .right { - width: 40px; - padding: 0 6px; -} - -.course-content ul.topics li.section .left { - padding-top: 22px; - text-align: right; -} - -.jsenabled .course-content ul.topics li.section .left, -.jsenabled .course-content ul.topics li.section .right { - width: auto; -} - -.course-content ul.topics li.section .left .section-handle img.icon { - padding: 0; - vertical-align: baseline; -} - -.course-content ul.topics li.section .section_action_menu .textmenu, -.course-content ul.topics li.section .section_action_menu .menu-action-text { - white-space: nowrap; -} \ No newline at end of file diff --git a/course/format/weeks/styles.css b/course/format/weeks/styles.css deleted file mode 100644 index eee188fbffc..00000000000 --- a/course/format/weeks/styles.css +++ /dev/null @@ -1,34 +0,0 @@ -.course-content ul.weeks { - margin: 0; - list-style: none; -} - -.course-content ul.weeks li.section .content { - margin: 0 40px; -} - -.course-content ul.weeks li.section .left, -.course-content ul.weeks li.section .right { - width: 40px; - padding: 0 6px; -} - -.course-content ul.weeks li.section .left { - padding-top: 22px; - text-align: right; -} - -.jsenabled .course-content ul.weeks li.section .left, -.jsenabled .course-content ul.weeks li.section .right { - width: auto; -} - -.course-content ul.weeks li.section .left .section-handle img.icon { - padding: 0; - vertical-align: baseline; -} - -.course-content ul.weeks li.section .section_action_menu .textmenu, -.course-content ul.weeks li.section .section_action_menu .menu-action-text { - white-space: nowrap; -} \ No newline at end of file diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss index 54f5e9d5383..5880a1393fa 100644 --- a/theme/boost/scss/moodle/course.scss +++ b/theme/boost/scss/moodle/course.scss @@ -325,24 +325,23 @@ body:not(.editing) .sitetopic ul.section { .course-content ul.topics, .course-content ul.weeks { padding: 0; + margin: 0; + list-style: none; li.section { margin-top: $spacer; padding-bottom: $spacer; - .content { - margin: 0; - padding: 0; - } - .summary, .content > .availabilityinfo { margin-left: 25px; } - .left { - padding-top: 0; + .left, + .right { + padding: 0 6px 0; text-align: right; + width: auto; } } } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index fc535758096..543d290cfd8 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -12800,24 +12800,25 @@ body:not(.editing) .sitetopic ul.section { .course-content ul.topics, .course-content ul.weeks { - padding: 0; } + padding: 0; + margin: 0; + list-style: none; } .course-content ul.topics li.section, .course-content ul.weeks li.section { margin-top: 1rem; padding-bottom: 1rem; } - .course-content ul.topics li.section .content, - .course-content ul.weeks li.section .content { - margin: 0; - padding: 0; } .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.weeks li.section .left { - padding-top: 0; - text-align: right; } + .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 { margin-top: 0; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index a360666f7e0..1b36593b29d 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -13012,24 +13012,25 @@ body:not(.editing) .sitetopic ul.section { .course-content ul.topics, .course-content ul.weeks { - padding: 0; } + padding: 0; + margin: 0; + list-style: none; } .course-content ul.topics li.section, .course-content ul.weeks li.section { margin-top: 1rem; padding-bottom: 1rem; } - .course-content ul.topics li.section .content, - .course-content ul.weeks li.section .content { - margin: 0; - padding: 0; } .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.weeks li.section .left { - padding-top: 0; - text-align: right; } + .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 { margin-top: 0; } -- 2.17.1