Merge pull request #43 from NHSLeadership/develop

Develop
NHSLeadership · Aug 10, 2023 · 3b2cb92 · 3b2cb92
2 parents 40eb639 + 9a901c9
commit 3b2cb92
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "nhsla/moodle-nhse",
     "type": "moodle-theme",
-    "version": "2023073103",
+    "version": "2023081001",
     "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 = '2023073103';
+$THEME->version = '2023081001';
 $THEME->parents = ['boost'];
 $THEME->regions = [];
 $THEME->sheets = [];

diff --git a/scss/nhse.scss b/scss/nhse.scss
@@ -19,11 +19,22 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 600;
 }
 
-ul,
-ol,
-p {
-  font-size: initial;
-  line-height: initial;
+
+ul {
+  @extend %nhsuk-list;
+  @extend %nhsuk-list--bullet;
+}
+
+ol {
+  @extend %nhsuk-list;
+  @extend %nhsuk-list--number;
+}
+
+.coursebox {
+  p {
+    font-size: initial;
+    line-height: initial;
+  }
 }
 
 .course_category_tree {
@@ -40,7 +51,13 @@ p {
  * Button styles
  */
 .btn {
-  &:not(.btn-link):not(.btn-icon):not(.search-icon):not(.dropdown-toggle):not(.icon-no-margin) {
+  &:not(.btn-close)
+  &:not(.btn-icon)
+  &:not(.btn-link)
+  &:not(.btn-open)
+  &:not(.search-icon)
+  &:not(.dropdown-toggle)
+  &:not(.icon-no-margin) {
     @extend .nhsuk-button--small;
   }
 }
@@ -314,10 +331,13 @@ body.limitedwidth {
 
   .navbar-nav {
     .btn {
-      color: $btn-primary-text;
-      background-color: $btn-primary-background;
-      border-color: transparent;
-      border-bottom: none;
+      &:not(.btn-close)
+      &:not(.btn-open) {
+        color: $btn-primary-text;
+        background-color: $btn-primary-background;
+        border-color: transparent;
+        border-bottom: none;
+      }
     }
 
     .custom-control-input:checked~.custom-control-label::before {
@@ -352,10 +372,13 @@ body.limitedwidth {
 
     .navbar-nav {
       .btn {
-        color: $btn-default-text;
-        background-color: $btn-default-background;
-        border-color: transparent;
-        border-bottom: none;
+        &:not(.btn-close)
+        &:not(.btn-open) {
+          color: $btn-default-text;
+          background-color: $btn-default-background;
+          border-color: transparent;
+          border-bottom: none;
+        }
       }
     }
 
@@ -474,11 +497,23 @@ body.limitedwidth {
   }
 }
 
-.simplesearchform .input-group input.form-control {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
+.simplesearchform {
+  .collapse.show {
+    background-color: $color_nhsuk-blue;
+  }
+  .simplesearchform {
+    .collapsing {
+      background-color: $color_nhsuk-blue;
+    }
+  }
+  .input-group {
+    input.form-control {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
 }
 
 [data-region=right-hand-drawer].drawer {

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 = 2023073103;
+$plugin->version = 2023081001;
 $plugin->release = '401.0.1';
 $plugin->maturity = MATURITY_BETA;