naturescot-frontend 4.5.3 → 5.9.0

package/naturescot/components/cookie-bar/_cookie-bar.scss

@@ -1,6 +1,6 @@
-@import "govuk-frontend/govuk/settings/all";
-@import "govuk-frontend/govuk/tools/all";
-@import "govuk-frontend/govuk/helpers/all";
+@import "govuk-frontend/dist/govuk/settings/index";
+@import "govuk-frontend/dist/govuk/tools/index";
+@import "govuk-frontend/dist/govuk/helpers/index";
 
 @include govuk-exports("naturescot/component/cookie-bar") {
   .naturescot-cookie-bar {

package/naturescot/components/footer/_footer.scss

@@ -1,8 +1,8 @@
-@import "govuk-frontend/govuk/settings/all";
-@import "govuk-frontend/govuk/tools/all";
-@import "govuk-frontend/govuk/helpers/all";
+@import "govuk-frontend/dist/govuk/settings/index";
+@import "govuk-frontend/dist/govuk/tools/index";
+@import "govuk-frontend/dist/govuk/helpers/index";
 
-@import "govuk-frontend/govuk/helpers/typography";
+@import "govuk-frontend/dist/govuk/helpers/typography";
 
 $naturescot-logo: "naturescot-logo.png" !default;
 
@@ -16,17 +16,6 @@ $naturescot-logo: "naturescot-logo.png" !default;
   $naturescot-footer-link: $naturescot-footer-text;
   $naturescot-footer-link-hover: false;
 
-  @if ($govuk-use-legacy-palette) {
-    // sass-lint:disable no-color-literals
-    $naturescot-footer-border-top: #a1acb2;
-    $naturescot-footer-border: govuk-colour("grey-2");
-    $naturescot-footer-text: #454a4c;
-    $naturescot-footer-link: $naturescot-footer-text;
-
-    // Only used with the legacy palette
-    $naturescot-footer-link-hover: #171819;
-  }
-
   // Was originally based on the govuk-crest-2x.png image dimensions, but the new
   // image is larger.
   $naturescot-footer-crest-image-width-original: 512px;
@@ -46,49 +35,30 @@ $naturescot-logo: "naturescot-logo.png" !default;
   }
 
   .naturescot-footer__link {
-    @if ($govuk-use-legacy-palette) {
-      &:link,
-      &:visited {
-        color: $naturescot-footer-link;
-      }
-
-      &:hover,
-      &:active {
-        color: $naturescot-footer-link-hover;
-      }
-    } @else {
-      &:link,
-      &:visited,
-      &:hover,
-      &:active {
-        color: $naturescot-footer-link;
-      }
+    &:link,
+    &:visited,
+    &:hover,
+    &:active {
+      color: $naturescot-footer-link;
     }
+    
 
     &:focus {
       @include govuk-focused-text;
     }
 
-    // alphagov/govuk_template includes a specific a:link:focus selector
-    // designed to make unvisited links a slightly darker blue when focussed, so
-    // we need to override the text colour for that combination of selectors.
-    @include govuk-compatibility(govuk_template) {
-      &:link:focus {
-        @include govuk-text-colour;
-      }
+    &:link:focus {
+      @include govuk-text-colour;
     }
   }
 
-  // Internet Explorer 8 does not support `:not()` selectors, so don't conditionally show underlines.
-  @include govuk-not-ie8 {
-    .naturescot-footer__inline-list .naturescot-footer__link,
-    .naturescot-footer__list .naturescot-footer__link {
-      text-decoration: none;
+  .naturescot-footer__inline-list .naturescot-footer__link,
+  .naturescot-footer__list .naturescot-footer__link {
+    text-decoration: none;
 
-      &:hover:not(:focus),
-      &:active:not(:focus) {
-        text-decoration: underline;
-      }
+    &:hover:not(:focus),
+    &:active:not(:focus) {
+      text-decoration: underline;
     }
   }
 

package/naturescot/components/header/_header.scss

@@ -1,8 +1,8 @@
-@import "govuk-frontend/govuk/settings/all";
-@import "govuk-frontend/govuk/tools/all";
-@import "govuk-frontend/govuk/helpers/all";
+@import "govuk-frontend/dist/govuk/settings/index";
+@import "govuk-frontend/dist/govuk/tools/index";
+@import "govuk-frontend/dist/govuk/helpers/index";
 
-@import "govuk-frontend/govuk/helpers/typography";
+@import "govuk-frontend/dist/govuk/helpers/typography";
 
 @include govuk-exports("naturescot/component/header") {
   $naturescot-header-background: #5e8bbf;
@@ -81,14 +81,10 @@
       @include govuk-focused-text;
     }
 
-    // alphagov/govuk_template includes a specific a:link:focus selector
-    // designed to make unvisited links a slightly darker blue when focussed, so
-    // we need to override the text colour for that combination of selectors.
-    @include govuk-compatibility(govuk_template) {
-      &:link:focus {
-        @include govuk-text-colour;
-      }
+    &:link:focus {
+      @include govuk-text-colour;
     }
+    
   }
 
   .naturescot-header__link--homepage {
@@ -291,27 +287,6 @@
     }
   }
 
-  @if $govuk-use-legacy-font {
-    // Begin adjustments for font baseline offset
-    // These should be removed when the font is updated with the correct baseline
-    .naturescot-header__logotype-crown,
-    .naturescot-header__logotype-crown-fallback-image {
-      position: relative;
-      top: -4px;
-      vertical-align: middle;
-    }
-
-    .naturescot-header {
-      $offset: 3px;
-      padding-top: $offset;
-    }
-
-    .naturescot-header__link--homepage {
-      line-height: 30px;
-    }
-    // End adjustments
-  }
-
   // Styles for the .svg used in the header.
 
   .whitename {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "naturescot-frontend",
-  "version": "4.5.3",
+  "version": "5.9.0",
   "description": "NatureScot's extensions to GDS' govuk-frontend",
   "author": "Mike Coats <mike.coats@nature.scot>",
   "repository": "github:Scottish-Natural-Heritage/naturescot-frontend",
   "license": "(MIT OR OGL-UK-3.0 OR Apache-2.0)",
   "peerDependencies": {
-    "govuk-frontend": "^4.5.0",
-    "sass": "^1.35.2"
+    "govuk-frontend": "^5.9.0",
+    "sass": "^1.85.1"
   },
   "devDependencies": {
     "prettier": "^1.19.1"