Skip to content

Commit 9e6ceaf

Browse files
committed
TD-6277 Colour changes
1 parent 40d7cac commit 9e6ceaf

File tree

21 files changed

+62
-62
lines changed

21 files changed

+62
-62
lines changed

DigitalLearningSolutions.Web/Styles/frameworks/comments.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
}
66

77
.nhsuk-card.comment.comment-mine {
8-
border-color: $color_nhsuk-green;
8+
border-color: nhsuk-colour("green");
99
}
1010

1111
.nhsuk-card.comment.comment-other {
12-
border-color: $color_nhsuk-blue;
12+
border-color: nhsuk-colour("blue");
1313
}
1414

1515
.heading-xxs {
@@ -18,7 +18,7 @@
1818

1919
.heading-light {
2020
font-weight: 200;
21-
color: $color_nhsuk-grey-1;
21+
color: nhsuk-colour("grey-1");
2222
}
2323

2424
.grid-column-ninety {

DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ ol.hee-fwservice--framework-progress-bar {
144144
width: 150px; // hacky way to make the line the right size
145145
.hee-fwservice--framework-progress-marker {
146146
position: relative;
147-
border: 2px solid $color_nhsuk-blue;
147+
border: 2px solid nhsuk-colour("blue");
148148
border-radius: 50%;
149149
width: 2rem;
150150
height: 2rem;
@@ -154,7 +154,7 @@ ol.hee-fwservice--framework-progress-bar {
154154
.hee-fwservice--framework-progress-marker::before {
155155
content: '';
156156
width: 120px;
157-
border-top: 1px solid $color_nhsuk-blue;
157+
border-top: 1px solid nhsuk-colour("blue");
158158
position: absolute;
159159
top: 50%;
160160
left: 100%;
@@ -171,8 +171,8 @@ ol.hee-fwservice--framework-progress-bar {
171171

172172
.hee-fwservice--framework-progress-marker {
173173
font-weight: normal;
174-
color: $color_nhsuk-white;
175-
background-color: $color_nhsuk-blue;
174+
color: nhsuk-colour("white");
175+
background-color: nhsuk-colour("blue");
176176
}
177177
}
178178
}
@@ -182,7 +182,7 @@ ul.no-decs {
182182
}
183183

184184
.hee-fwservice--framework-structure {
185-
background-color: $color_nhsuk-white;
185+
background-color: nhsuk-colour("white");
186186
display: block;
187187
padding: 24px;
188188
margin-bottom: 24px;

DigitalLearningSolutions.Web/Styles/home/learningContent.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
.learning-content-item__image-box {
4949
box-shadow: 0 0 10px 1px rgba(0, 0, 0, 0.05);
50-
background: $color_nhsuk-white;
50+
background: nhsuk-colour("white");
5151
border-radius: 4px;
5252
padding: 8px;
5353
height: fit-content;

DigitalLearningSolutions.Web/Styles/home/welcome.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
}
2727

2828
.auth-button--blue {
29-
background-color: $color_nhsuk-blue;
29+
background-color: nhsuk-colour("blue");
3030
}
3131

3232
.auth-button--blue:hover {
33-
background-color: darken($color_nhsuk-blue, 5%);
33+
background-color: darken(nhsuk-colour("blue"), 5%);
3434
}

DigitalLearningSolutions.Web/Styles/index.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ ul.no-bullets {
219219

220220
.side-nav__heading {
221221
@extend .nhsuk-u-font-weight-bold;
222-
color: $color_nhsuk-grey-1;
222+
color: nhsuk-colour("grey-1");
223223
@include nhsuk-responsive-margin(3, "bottom");
224224
@include nhsuk-responsive-padding(1, "top");
225225
@extend .nhsuk-u-font-size-19;
@@ -266,7 +266,7 @@ ul.no-bullets {
266266
ul {
267267
display: table;
268268
list-style-type: none;
269-
border-bottom: 1px solid $color_nhsuk-grey-1;
269+
border-bottom: 1px solid nhsuk-colour("grey-1");
270270
table-layout: fixed;
271271
width: 100%;
272272
text-align: center;
@@ -283,7 +283,7 @@ ul.no-bullets {
283283
}
284284

285285
&.active {
286-
border-bottom: 3px solid $color_nhsuk-blue;
286+
border-bottom: 3px solid nhsuk-colour("blue");
287287
font-weight: bold;
288288
background-color: white;
289289
}

DigitalLearningSolutions.Web/Styles/layout.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ footer {
247247
text-transform: uppercase;
248248

249249
&.header-beta--dark {
250-
color: $color_nhsuk-dark-pink;
250+
color: nhsuk-colour("dark-pink");
251251
}
252252
}
253253

@@ -261,7 +261,7 @@ footer {
261261
}
262262

263263
.dls-alert-banner {
264-
background-color: $color_nhsuk-dark-pink;
264+
background-color: nhsuk-colour("dark-pink");
265265
padding-bottom: 0.1px;
266266
color: #FFFFFF;
267267

@@ -280,8 +280,8 @@ footer {
280280

281281
.feedback-tag {
282282
align-items: center;
283-
background-color: $color_nhsuk-blue;
284-
color: $color_nhsuk-white;
283+
background-color: nhsuk-colour("blue");
284+
color: nhsuk-colour("white");
285285
display: inline-flex;
286286
font-family: "Frutiger W01", Arial, sans-serif;
287287
font-size: 19px;
@@ -302,8 +302,8 @@ footer {
302302
}
303303

304304
.feedback-bar {
305-
background-color: $color_nhsuk-grey-5;
306-
border-bottom: 1px solid $color_nhsuk-grey-4;
305+
background-color: nhsuk-colour("grey-5");
306+
border-bottom: 1px solid nhsuk-colour("grey-4");
307307
}
308308

309309
.validation-summary-valid {

DigitalLearningSolutions.Web/Styles/learningMenu/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ hr.thick {
6363
}
6464

6565
.passed-text {
66-
color: $color_nhsuk-green;
66+
color: nhsuk-colour("green");
6767
}
6868

6969
.not-passed-text {

DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// MIT License
77
@use "nhsuk-frontend/dist/nhsuk/core/settings/" as *;
88

9-
$track-color: $color_nhsuk-grey-3 !default;
10-
$thumb-color: $color_nhsuk-grey-2 !default;
9+
$track-color: nhsuk-colour("grey-3") !default;
10+
$thumb-color: nhsuk-colour("grey-2") !default;
1111

1212
$thumb-radius: 2px !default;
1313
$thumb-height: 24px !default;
@@ -18,7 +18,7 @@ $thumb-border-color: #eceff1 !default;
1818
$track-width: 100% !default;
1919
$track-height: 24px !default;
2020
$track-border-width: 2px !default;
21-
$track-border-color: $color_nhsuk-grey-3 !default;
21+
$track-border-color: nhsuk-colour("grey-3") !default;
2222
$focus-track-border-width: 4px !default;
2323

2424
$track-radius: 5px !default;
@@ -55,7 +55,7 @@ $track-radius: 5px !default;
5555
}
5656

5757
&:focus {
58-
border: $focus-track-border-width solid $color_nhsuk-black;
58+
border: $focus-track-border-width solid nhsuk-colour("black");
5959
box-shadow: 0 0 0 4px $nhsuk-focus-color;
6060

6161
&::-webkit-slider-runnable-track {
@@ -68,7 +68,7 @@ $track-radius: 5px !default;
6868
}
6969

7070
&::-moz-range-progress {
71-
background-color: $color_nhsuk-blue;
71+
background-color: nhsuk-colour("blue");
7272
height: $track-height - ( 2 * $focus-track-border-width);
7373
border-radius: 3px;
7474
}
@@ -128,7 +128,7 @@ $track-radius: 5px !default;
128128
border: $track-border-width solid $track-border-color;
129129
border-radius: $track-radius;
130130
box-sizing: content-box;
131-
background: $color_nhsuk-blue;
131+
background: nhsuk-colour("blue");
132132
}
133133

134134
&::-ms-fill-upper {
@@ -139,7 +139,7 @@ $track-radius: 5px !default;
139139
}
140140

141141
&::-moz-range-progress {
142-
background-color: $color_nhsuk-blue;
142+
background-color: nhsuk-colour("blue");
143143
height: $track-height - ( 2 * $track-border-width);
144144
border-radius: 3px;
145145
}
@@ -148,7 +148,7 @@ $track-radius: 5px !default;
148148
overflow-x: hidden;
149149

150150
&::-webkit-slider-thumb {
151-
box-shadow: -800px 0 0 800px $color_nhsuk-blue;
151+
box-shadow: -800px 0 0 800px nhsuk-colour("blue");
152152
}
153153

154154
.js-enabled & {

DigitalLearningSolutions.Web/Styles/learningPortal/current.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
.searchable-element {
55
&.overdue {
66
background-color: #fff;
7-
border-left: 6px solid $color_nhsuk-red;
7+
border-left: 6px solid nhsuk-colour("red");
88
}
99

1010
&.due-soon {
1111
background-color: #fff;
12-
border-left: 6px solid $color_nhsuk-yellow;
12+
border-left: 6px solid nhsuk-colour("yellow");
1313
}
1414
}
1515

1616
a.delete-button {
17-
background-color: $color_nhsuk-red;
18-
box-shadow: 0 4px 0 shade($color_nhsuk-red, 50%);
17+
background-color: nhsuk-colour("red");
18+
box-shadow: 0 4px 0 shade(nhsuk-colour("red"), 50%);
1919
margin-bottom: 16px !important;
2020

2121
&:hover {
22-
background-color: shade($color_nhsuk-red, 20%);
22+
background-color: shade(nhsuk-colour("red"), 20%);
2323
}
2424

2525
&:active {
26-
background-color: shade($color_nhsuk-red, 50%);
26+
background-color: shade(nhsuk-colour("red"), 50%);
2727
}
2828
}
2929

3030
.overdue {
31-
background-color: tint($color_nhsuk-red, 80);
31+
background-color: tint(nhsuk-colour("red"), 80);
3232
}
3333

3434
.due-soon {
35-
background-color: $color_nhsuk-yellow;
35+
background-color: nhsuk-colour("yellow");
3636
}
3737

3838
h3.course-title {

DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ details.nhsuk-details {
5656

5757
.score {
5858
margin-left: 48px;
59-
color: $color_nhsuk-black;
59+
color: nhsuk-colour("black");
6060
font-size: 1.25rem;
6161
font-weight: 600;
6262
display: inline-block;
@@ -97,7 +97,7 @@ details.nhsuk-details {
9797
padding-right: 32px;
9898
margin-top: 20px;
9999
margin-bottom: 20px;
100-
background-color: $color_nhsuk-grey-5;
100+
background-color: nhsuk-colour("grey-5");
101101
box-sizing: border-box;
102102
}
103103

0 commit comments

Comments
 (0)