Skip to content

Commit 22cb368

Browse files
Fix Stylelint issues
1 parent 0a455c2 commit 22cb368

12 files changed

Lines changed: 43 additions & 50 deletions

app/assets/sass/_misc.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// height: 150px;
66

77
outline: 1px solid rgba(255, 255, 255, 0.2);
8-
background-color: black;
8+
background-color: #000000;
99

1010
p {
1111
margin-left: 5px;
12-
color: white;
12+
color: #ffffff;
1313
}
1414
}
1515

@@ -37,11 +37,11 @@
3737
display: none;
3838
}
3939

40-
body.js-enabled .app-js-only {
40+
.nhsuk-frontend-supported .app-js-only {
4141
display: block;
4242
}
4343

44-
body.js-enabled .app-no-js-only {
44+
.nhsuk-frontend-supported .app-no-js-only {
4545
display: none;
4646
}
4747

app/assets/sass/_typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ h3 {
1717
}
1818

1919
.nhsuk-link--no-visited-state a {
20-
@extend .nhsuk-link--no-visited-state;
20+
@include nhsuk-link-style-no-visited-state;
2121
}
2222

2323
.app-link--error,

app/assets/sass/_workflow.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,13 @@
6969
}
7070

7171
// Only apply link styles to actual links
72+
// stylelint-disable-next-line selector-no-qualifying-type
7273
a.app-workflow-side-nav__link {
7374
@include nhsuk-link-style-default;
7475
@include nhsuk-link-style-no-visited-state;
7576

7677
&:hover {
78+
// stylelint-disable-next-line selector-no-qualifying-type
7779
.app-workflow-side-nav__label {
7880
text-decoration: underline;
7981
text-decoration-thickness: max(3px, 0.1875rem, 0.12em);
@@ -92,14 +94,6 @@ a.app-workflow-side-nav__link {
9294
cursor: not-allowed;
9395
}
9496

95-
// Clickable links (not current, not completed, not disabled) have blue circles
96-
.app-workflow-side-nav__link--clickable {
97-
.app-workflow-side-nav__number {
98-
color: nhsuk-colour("white");
99-
background-color: nhsuk-colour("blue");
100-
}
101-
}
102-
10397
.app-workflow-side-nav__number {
10498
display: flex;
10599

app/assets/sass/components/_annotation.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* Mammogram annotation styles */
21
@use "nhsuk-frontend/dist/nhsuk/core" as *;
32

3+
// Mammogram annotation styles
4+
45
.app-mammogram-image {
56
display: block;
67
max-width: 100%;
@@ -56,7 +57,7 @@
5657
line-height: 1;
5758
}
5859

59-
/* Visual feedback when dragging */
60+
// Visual feedback when dragging
6061
.app-mammogram-marker.dragging {
6162
// filter: drop-shadow(0 0 3px rgba(255, 255, 255, 0.9)) drop-shadow(0 0 6px rgba(255, 255, 255, 0.5));
6263
transform: translate(-50%, -50%) scale(1.1);

app/assets/sass/components/_button-menu.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
@use "nhsuk-frontend/dist/nhsuk/core" as *;
2+
13
// Button Menu Component
24
// Adapted from MOJ Frontend for NHS prototype use
3-
@use "nhsuk-frontend/dist/nhsuk/core" as *;
45

56
.app-button-menu {
67
display: inline-block;
@@ -50,7 +51,7 @@
5051
}
5152
}
5253

53-
/* Menu items with no JS */
54+
// Menu items with no JS
5455
.app-button-menu__item {
5556
display: inline-block;
5657
width: auto; // Override NHS UK's 100% width
@@ -67,7 +68,7 @@
6768
margin: 0;
6869
}
6970

70-
/* Menu items with JS */
71+
// Menu items with JS
7172
.app-button-menu li > .app-button-menu__item {
7273
box-sizing: border-box;
7374
display: inline-block;

app/assets/sass/components/_dark-mode.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// stylelint-disable declaration-no-important
2+
13
@use "nhsuk-frontend/dist/nhsuk/core" as *;
24

35
$app-dark-mode-blue: #348de0;
@@ -188,7 +190,7 @@ $app-tag--blue-dark-text: nhsuk-tint(nhsuk-colour("blue"), 80%);
188190
&:visited,
189191
&:active,
190192
&:hover {
191-
color: white;
193+
color: #ffffff;
192194
}
193195
}
194196

app/assets/sass/components/_modal.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
$app-modal-width: 700px !default; // Default width for the modal
44

55
// Prevent background scrolling when modal is open
6+
// stylelint-disable-next-line selector-no-qualifying-type
67
body.app-modal-open {
78
width: 100%;
89
overflow: hidden;

app/assets/sass/components/_reading.scss

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22

33
// app/assets/sass/components/_reading.scss
44

5-
.app-reading-status {
6-
padding: 10px;
7-
color: $nhsuk-reverse-text-colour;
8-
background-color: nhsuk-shade(nhsuk-colour("blue"), 40%);
9-
10-
a {
11-
color: $nhsuk-reverse-text-colour;
12-
}
13-
}
14-
155
// Mammogram thumbnail grid for reading pages
166
.app-mammogram-thumbnails {
177
display: inline-grid;
@@ -163,6 +153,10 @@
163153
color: $nhsuk-reverse-text-colour;
164154
background-color: nhsuk-shade(nhsuk-colour("blue"), 40%);
165155

156+
a {
157+
color: $nhsuk-reverse-text-colour;
158+
}
159+
166160
&__row {
167161
display: flex;
168162
flex-wrap: wrap;

app/assets/sass/components/_secondary-navigation-overrides.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// app/assets/sass/components/_secondary-navigation-overrides.scss
21
@use "nhsuk-frontend/dist/nhsuk/core" as *;
32

3+
// app/assets/sass/components/_secondary-navigation-overrides.scss
4+
45
// Fix for tick SVG in secondary navigation
56
.app-secondary-navigation__link {
67
// gap is already set to 6px in the main component

app/assets/sass/components/_stepper-input.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// stylelint-disable declaration-no-important
2+
13
// app/assets/sass/components/_stepper-input.scss
24

35
.app-stepper-input {
@@ -44,6 +46,7 @@
4446
}
4547
}
4648

49+
// stylelint-disable-next-line selector-no-qualifying-type
4750
.app-stepper-input input.nhsuk-input {
4851
text-align: center;
4952
}

0 commit comments

Comments
 (0)