DI-5563 Lists styles reset globally

NHSLeadership · Aug 3, 2023 · 38cfd81 · 38cfd81
1 parent 6f40256
commit 38cfd81
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "nhsla/moodle-nhse",
     "type": "moodle-theme",
-    "version": "2023073102",
+    "version": "2023073103",
     "require": {
         "composer/installers": "~1.0"
     },

diff --git a/config.php b/config.php
@@ -43,7 +43,7 @@
 
 $THEME->doctype = 'html5';
 $THEME->name = 'nhse';
-$THEME->version = '2023073102';
+$THEME->version = '2023073103';
 $THEME->parents = ['boost'];
 $THEME->regions = [];
 $THEME->sheets = [];
@@ -201,7 +201,7 @@
 $THEME->haseditswitch = true;
 $THEME->usescourseindex = true;
 
-// Control displaying nhse titles.
+// Control displaying nhse titles (Boost is set to true).
 $THEME->activityheaderconfig = [
     'notitle' => false
 ];
diff --git a/scss/nhse.scss b/scss/nhse.scss
@@ -19,13 +19,11 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 600;
 }
 
-.coursebox {
-  ul,
-  ol,
-  p {
-    font-size: initial;
-    line-height: initial;
-  }
+ul,
+ol,
+p {
+  font-size: initial;
+  line-height: initial;
 }
 
 .course_category_tree {
@@ -68,7 +66,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   flex-direction: column;
 
   #page {
-    padding-top: 3rem;
+    padding-top: 0;
     margin-top: 0;
   }
 
@@ -267,6 +265,8 @@ body.limitedwidth {
 
 .nav-link {
   padding: 0.6rem 1rem;
+  font-size: 1rem;
+  line-height: 1.5;
 }
 
 .navbar {
@@ -489,6 +489,10 @@ body.limitedwidth {
   display: none;
 }
 
+.nhsuk-header__navigation-item {
+  border-top: none;
+}
+
 .popover-region-toggle::before, .popover-region-toggle::after {
   display: none;
 }

diff --git a/templates/drawers.mustache b/templates/drawers.mustache
@@ -170,10 +170,10 @@
 </body>
 </html>
 {{#js}}
-    M.util.js_pending('theme_boost/loader');
-    require(['theme_boost/loader', 'theme_boost/drawer'], function(Loader, Drawer) {
+M.util.js_pending('theme_boost/loader');
+require(['theme_boost/loader', 'theme_boost/drawer'], function(Loader, Drawer) {
     Drawer.init();
-    M.util.js_complete('theme_boost/loader');
-    });
+M.util.js_complete('theme_boost/loader');
+});
 {{/js}}
 
diff --git a/templates/footer.mustache b/templates/footer.mustache
@@ -56,31 +56,29 @@
                         {{{ output.login_info }}}
                         {{{ output.debug_footer_html }}}
                     </div>
-                    <div class="tool_usertours-resettourcontainer">
-                    </div>
-
+                    <div class="tool_usertours-resettourcontainer"></div>
                     {{{ output.standard_footer_html }}}
                     {{{ output.standard_end_of_body_html }}}
                 </div>
 
                 <div class="nhsuk-grid-column-one-half">
-                    <div>{{#str}}poweredbymoodle, core{{/str}}</div>
+                    {{#str}}poweredbymoodle, core{{/str}}
                     {{#output.moodle_release}}
-                        <div>
-                            {{#str}}version, core{{/str}} {{{ output.moodle_release }}}
-                        </div>
+                        {{#str}}version, core{{/str}} {{{ output.moodle_release }}}
                     {{/output.moodle_release}}
                 </div>
 
-                <p class="nhsuk-footer__copyright">© Copyright, Leadership Academy YYYY</p>
+                <div class="nhsuk-grid-column-one-half nhsuk-footer__copyright">
+                    © Copyright, Leadership Academy YYYY
+                </div>
             </div>
 
         </div>
     </div>
 </footer>
 {{#js}}
-    require(['theme_boost/footer-popover'], function(FooterPopover) {
+require(['theme_boost/footer-popover'], function(FooterPopover) {
     FooterPopover.init();
-    });
+});
 {{/js}}
 
diff --git a/version.php b/version.php
@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 // This is the version of the plugin.
-$plugin->version = 2023073102;
+$plugin->version = 2023073103;
 $plugin->release = '401.0.1';
 $plugin->maturity = MATURITY_BETA;