From cb9a904174dd253409dd332b7313f98af3ee9b59 Mon Sep 17 00:00:00 2001 From: roshaanbajwa Date: Tue, 14 May 2024 12:45:23 +0100 Subject: [PATCH] fix linting errors --- CHANGELOG.md | 2 +- packages/components/header/_header-organisation.scss | 3 ++- packages/components/header/_header-service.scss | 3 ++- packages/components/header/_header.scss | 11 ++++++++--- packages/core/generic/_font-face.scss | 6 ++++-- packages/core/tools/_focused.scss | 4 +++- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d05b482d2..e6fbeb28b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,8 @@ ## Unreleased :wrench: **Fixes** -- Align label bottom margins with fieldset legend bottom margins ([PR 946](https://github.com/nhsuk/nhsuk-frontend/pull/946)). +- Align label bottom margins with fieldset legend bottom margins ([PR 946](https://github.com/nhsuk/nhsuk-frontend/pull/946)). ## 8.1.1 - 14 March 2024 diff --git a/packages/components/header/_header-organisation.scss b/packages/components/header/_header-organisation.scss index 94df27a70..f2715badc 100644 --- a/packages/components/header/_header-organisation.scss +++ b/packages/components/header/_header-organisation.scss @@ -19,7 +19,8 @@ &:focus { background: $nhsuk-focus-color; - box-shadow: 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, + box-shadow: + 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, 0 $nhsuk-focus-width 0 $nhsuk-focus-width $nhsuk-focus-text-color; .nhsuk-organisation-name, diff --git a/packages/components/header/_header-service.scss b/packages/components/header/_header-service.scss index 112539c6a..a14e4556e 100644 --- a/packages/components/header/_header-service.scss +++ b/packages/components/header/_header-service.scss @@ -26,7 +26,8 @@ &:focus { background: $nhsuk-focus-color; - box-shadow: 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, + box-shadow: + 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, 0 $nhsuk-focus-width 0 $nhsuk-focus-width $nhsuk-focus-text-color; .nhsuk-header__service-name { diff --git a/packages/components/header/_header.scss b/packages/components/header/_header.scss index 1f4fe36af..782a45544 100644 --- a/packages/components/header/_header.scss +++ b/packages/components/header/_header.scss @@ -91,7 +91,8 @@ box-shadow: none; .nhsuk-logo { - box-shadow: 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, + box-shadow: + 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, 0 $nhsuk-focus-width 0 $nhsuk-focus-width $nhsuk-focus-text-color; } } @@ -278,7 +279,9 @@ &:focus { background-color: $nhsuk-focus-color; - box-shadow: 0 -4px $nhsuk-focus-color, 0 $nhsuk-focus-width $nhsuk-focus-text-color; + box-shadow: + 0 -4px $nhsuk-focus-color, + 0 $nhsuk-focus-width $nhsuk-focus-text-color; outline: $nhsuk-focus-width solid transparent; outline-offset: $nhsuk-focus-width; @@ -319,7 +322,9 @@ &:focus { @include nhsuk-focused-button(); - box-shadow: 0 -2px $nhsuk-focus-color, 0 $nhsuk-focus-width $nhsuk-focus-text-color; + box-shadow: + 0 -2px $nhsuk-focus-color, + 0 $nhsuk-focus-width $nhsuk-focus-text-color; } &:active { diff --git a/packages/core/generic/_font-face.scss b/packages/core/generic/_font-face.scss index 57b5a7a6b..0d79cf0e5 100644 --- a/packages/core/generic/_font-face.scss +++ b/packages/core/generic/_font-face.scss @@ -21,7 +21,8 @@ font-style: normal; font-weight: 400; src: nhsuk-font-url("FrutigerLTW01-55Roman.eot?#iefix"); - src: nhsuk-font-url("FrutigerLTW01-55Roman.eot?#iefix") format("eot"), + src: + nhsuk-font-url("FrutigerLTW01-55Roman.eot?#iefix") format("eot"), nhsuk-font-url("FrutigerLTW01-55Roman.woff2") format("woff2"), nhsuk-font-url("FrutigerLTW01-55Roman.woff") format("woff"), nhsuk-font-url("FrutigerLTW01-55Roman.ttf") format("truetype"), @@ -34,7 +35,8 @@ font-style: normal; font-weight: $nhsuk-font-bold; src: nhsuk-font-url("FrutigerLTW01-65Bold.eot?#iefix"); - src: nhsuk-font-url("FrutigerLTW01-65Bold.eot?#iefix") format("eot"), + src: + nhsuk-font-url("FrutigerLTW01-65Bold.eot?#iefix") format("eot"), nhsuk-font-url("FrutigerLTW01-65Bold.woff2") format("woff2"), nhsuk-font-url("FrutigerLTW01-65Bold.woff") format("woff"), nhsuk-font-url("FrutigerLTW01-65Bold.ttf") format("truetype"), diff --git a/packages/core/tools/_focused.scss b/packages/core/tools/_focused.scss index f97e3d98e..c64b85c8b 100644 --- a/packages/core/tools/_focused.scss +++ b/packages/core/tools/_focused.scss @@ -11,7 +11,9 @@ @mixin nhsuk-focused-text { background-color: $nhsuk-focus-color; - box-shadow: 0 -2px $nhsuk-focus-color, 0 $nhsuk-focus-width $nhsuk-focus-text-color; + box-shadow: + 0 -2px $nhsuk-focus-color, + 0 $nhsuk-focus-width $nhsuk-focus-text-color; color: $nhsuk-focus-text-color; // When colours are overridden, for example when users have a dark mode, // backgrounds and box-shadows disappear, so we need to ensure there's a