Skip to content

Commit 90e99d4

Browse files
Phil-NHSPhil-NHS
committed
TD-6277 color to colour renamings
1 parent 041eb2d commit 90e99d4

File tree

13 files changed

+41
-41
lines changed

13 files changed

+41
-41
lines changed

‎DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $nhs-dark-grey: #425563;
8080
button.nhsuk-pagination__link, a.nhsuk-pagination__link {
8181
border: none;
8282
background-color: transparent;
83-
color: $nhsuk-link-color;
83+
color: $nhsuk-link-colour;
8484
display: flex;
8585
// Since IE is bad at drawing boxes the correct size
8686
overflow: visible;
@@ -96,11 +96,11 @@ button.nhsuk-pagination__link, a.nhsuk-pagination__link {
9696
}
9797

9898
&:hover {
99-
color: $nhsuk-link-hover-color;
99+
color: $nhsuk-link-hover-colour;
100100
}
101101

102102
&:active {
103-
color: $nhsuk-link-active-color;
103+
color: $nhsuk-link-active-colour;
104104
}
105105
}
106106

‎DigitalLearningSolutions.Web/Styles/home/brands.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
.brands__top-horizontal-dash {
1414
@include mq($until: tablet) {
15-
border-top: 1px solid $nhsuk-border-color;
15+
border-top: 1px solid $nhsuk-border-colour;
1616
margin-top: nhsuk-spacing(3);
1717
}
1818
}
@@ -24,8 +24,8 @@
2424
}
2525

2626
.header-row {
27-
border-top: 1px solid $nhsuk-border-color;
28-
border-bottom: 1px solid $nhsuk-border-color;
27+
border-top: 1px solid $nhsuk-border-colour;
28+
border-bottom: 1px solid $nhsuk-border-colour;
2929
margin-top: nhsuk-spacing(3);
3030
margin-bottom: nhsuk-spacing(3);
3131
display: flex;
@@ -44,7 +44,7 @@
4444
}
4545

4646
.value-row {
47-
border-bottom: 1px solid $nhsuk-border-color;
47+
border-bottom: 1px solid $nhsuk-border-colour;
4848
margin-bottom: nhsuk-spacing(3);
4949
display: flex;
5050

‎DigitalLearningSolutions.Web/Styles/home/learningContent.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,18 @@
7171

7272
.see-more-link {
7373
&:visited {
74-
color: $nhsuk-link-visited-color;
74+
color: $nhsuk-link-visited-colour;
7575
}
7676

7777
&:link {
78-
color: $nhsuk-link-color;
78+
color: $nhsuk-link-colour;
7979
}
8080

8181
&:hover {
82-
color: $nhsuk-link-hover-color;
82+
color: $nhsuk-link-hover-colour;
8383
}
8484

8585
&:active {
86-
color: $nhsuk-link-active-color;
86+
color: $nhsuk-link-active-colour;
8787
}
8888
}

‎DigitalLearningSolutions.Web/Styles/index.scss‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ul > li > ul > li {
2626
}
2727

2828
.delete-button {
29-
background-color: $nhsuk-error-color;
29+
background-color: $nhsuk-error-colour;
3030
box-shadow: 0 4px 0 #6b140e;
3131
margin-bottom: 16px !important;
3232
}
@@ -65,7 +65,7 @@ ul > li > ul > li {
6565

6666

6767
input:invalid {
68-
border: $nhsuk-border-width-form-element-error solid $nhsuk-error-color;
68+
border: $nhsuk-border-width-form-element-error solid $nhsuk-error-colour;
6969
}
7070

7171
input[type=file] {
@@ -190,7 +190,7 @@ ul.no-bullets {
190190
}
191191

192192
.divider {
193-
border-bottom: 1px solid $nhsuk-border-color;
193+
border-bottom: 1px solid $nhsuk-border-colour;
194194
margin-bottom: nhsuk-spacing(3);
195195
}
196196

@@ -225,19 +225,19 @@ ul.no-bullets {
225225
@extend .nhsuk-u-font-size-19;
226226

227227
@include govuk-media-query($until: desktop) {
228-
color: $nhsuk-text-color;
228+
color: $nhsuk-text-colour;
229229
}
230230
}
231231

232232
.side-nav__link {
233233
text-decoration: none;
234234

235235
&:visited {
236-
color: $nhsuk-link-color;
236+
color: $nhsuk-link-colour;
237237
}
238238

239239
&:hover {
240-
color: $nhsuk-link-hover-color;
240+
color: $nhsuk-link-hover-colour;
241241
text-decoration: underline;
242242
}
243243
}
@@ -253,7 +253,7 @@ ul.no-bullets {
253253
}
254254

255255
.side-nav__item--selected {
256-
border-left: 4px solid $nhsuk-link-color;
256+
border-left: 4px solid $nhsuk-link-colour;
257257
@include nhsuk-responsive-padding(2, "left");
258258
@extend .nhsuk-u-font-weight-bold;
259259

@@ -302,12 +302,12 @@ ul.no-bullets {
302302
.button-as-link {
303303
background: none;
304304
border: none;
305-
color: $nhsuk-link-color;
305+
color: $nhsuk-link-colour;
306306
@extend .nhsuk-u-font-size-19;
307307
text-decoration: underline;
308308

309309
&:hover {
310-
color: $nhsuk-link-hover-color;
310+
color: $nhsuk-link-hover-colour;
311311
text-decoration: none;
312312
cursor: pointer;
313313
}

‎DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $track-radius: 5px !default;
5656

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

6161
&::-webkit-slider-runnable-track {
6262
border: none;

‎DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ details.nhsuk-details {
155155
.asset-title-header .title {
156156
font-size: 1.6rem;
157157
font-weight: bold;
158-
color: $nhsuk-secondary-text-color;
158+
color: $nhsuk-secondary-text-colour;
159159
padding: 1rem 0 0 0;
160160
display: inline-block;
161161
}
@@ -186,19 +186,19 @@ details.nhsuk-details {
186186
}
187187

188188
.tag.tag-article {
189-
background-color: $nhsuk-link-active-color;
189+
background-color: $nhsuk-link-active-colour;
190190
}
191191

192192
.tag.tag-online.course {
193-
background-color: $nhsuk-link-color;
193+
background-color: $nhsuk-link-colour;
194194
}
195195

196196
.tag.tag-learning.guide {
197-
background-color: $nhsuk-link-hover-color;
197+
background-color: $nhsuk-link-hover-colour;
198198
}
199199

200200
.tag.tag-video {
201-
background-color: $nhsuk-link-visited-color;
201+
background-color: $nhsuk-link-visited-colour;
202202
}
203203

204204
@media only screen and (max-width: $mq-tablet) {

‎DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@extend .nhsuk-u-margin-top-3;
66
@extend .nhsuk-u-margin-bottom-4;
77
padding-bottom: 16px;
8-
border: 1px solid $nhsuk-border-color;
8+
border: 1px solid $nhsuk-border-colour;
99
border-bottom-width: 4px;
1010
}
1111

‎DigitalLearningSolutions.Web/Styles/shared/reports.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ $light-blue: #8EBAFF;
7878
}
7979

8080
.ct-label {
81-
color: $nhsuk-secondary-text-color;
82-
fill: $nhsuk-secondary-text-color;
81+
color: $nhsuk-secondary-text-colour;
82+
fill: $nhsuk-secondary-text-colour;
8383
}
8484

8585
.ct-label.ct-label.ct-horizontal {

‎DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $button-active-colour: #002f5c;
3333
}
3434

3535
.input-with-submit-button {
36-
border: 2px solid $nhsuk-form-border-color;
36+
border: 2px solid $nhsuk-form-border-colour;
3737
border-right: 0;
3838
border-radius: 4px 0 0 4px;
3939
height: 52px;
@@ -59,7 +59,7 @@ $button-active-colour: #002f5c;
5959

6060
.pagination-input-with-no-js-submit-button-border {
6161
.js-enabled & {
62-
border-right: 2px solid $nhsuk-form-border-color;
62+
border-right: 2px solid $nhsuk-form-border-colour;
6363
border-radius: 4px;
6464

6565
&:focus {
@@ -81,7 +81,7 @@ $button-active-colour: #002f5c;
8181
}
8282

8383
.left-dropdown {
84-
border: 2px solid $nhsuk-form-border-color;
84+
border: 2px solid $nhsuk-form-border-colour;
8585
border-radius: 4px;
8686
height: 52px;
8787
padding: 0 9px;

‎DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
button.nhsuk-pagination__link {
4545
border: none;
4646
background-color: transparent;
47-
color: $nhsuk-link-color;
47+
color: $nhsuk-link-colour;
4848
display: flex;
4949
width: auto;
5050
// Since IE is bad at drawing boxes the correct size
@@ -65,11 +65,11 @@ button.nhsuk-pagination__link {
6565
}
6666

6767
&:hover {
68-
color: $nhsuk-link-hover-color;
68+
color: $nhsuk-link-hover-colour;
6969
}
7070

7171
&:active {
72-
color: $nhsuk-link-active-color;
72+
color: $nhsuk-link-active-colour;
7373
}
7474
}
7575

0 commit comments

Comments
 (0)