Skip to content

Commit

Permalink
fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
roshaanbajwa committed May 14, 2024
1 parent 8fce389 commit cb9a904
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion packages/components/header/_header-organisation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion packages/components/header/_header-service.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 8 additions & 3 deletions packages/components/header/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions packages/core/generic/_font-face.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/tools/_focused.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb9a904

Please sign in to comment.