Skip to content

Commit 701a16a

Browse files
Updates from NHS frontend 10.2 (#571)
Using some of the [new features](https://github.com/nhsuk/nhsuk-frontend/releases/tag/v10.2.0).
1 parent 3a1d6d9 commit 701a16a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+107
-111
lines changed

app/assets/sass/components/_button.scss

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
// Short button variant
2-
//
3-
// This button is slightly shorter than the usual one,
4-
// so that when it sits to the right of a text input
5-
// (eg a search box) it is the same height.
6-
//
7-
// Remove this when https://github.com/nhsuk/nhsuk-frontend/pull/1643 has
8-
// been merged and released.
9-
.app-button--small {
10-
@include nhsuk-font-size(16);
11-
padding: 5px 12px;
12-
}
131

142
.app-button--min-width {
153
min-width: 80px;

app/views/_deactivated.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
4646
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
4747
{{ button({
4848
text: "Send feedback",
49-
classes: "nhsuk-button--secondary app-button--small"
49+
classes: "nhsuk-button--secondary nhsuk-button--small"
5050
}) }}
5151

5252

app/views/_feedback-panel.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@ <h2 class="app-feedback-panel__title">You’ve just recorded your 5th vaccinatio
1616

1717
{{ button({
1818
text: "Very easy",
19-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
19+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
2020
attributes: {
2121
"data-thanks": "Thank you. Do you want to tell us more?"
2222
}
2323
}) }}
2424

2525
{{ button({
2626
text: "Easy",
27-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
27+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
2828
attributes: {
2929
"data-thanks": "Thank you. Do you want to tell us more?"
3030
}
3131
}) }}
3232

3333
{{ button({
3434
text: "Ok",
35-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
35+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
3636
attributes: {
3737
"data-thanks": "Thank you. Do you want to tell us more?"
3838
}
3939
}) }}
4040

4141
{{ button({
4242
text: "Difficult",
43-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
43+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
4444
attributes: {
4545
"data-thanks": "Thank you. Do you want to tell us more?"
4646
}
4747
}) }}
4848

4949
{{ button({
5050
text: "Very difficult",
51-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
51+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
5252
attributes: {
5353
"data-thanks": "Thank you. Do you want to tell us more?"
5454
}
@@ -82,7 +82,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
8282
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
8383
{{ button({
8484
text: "Send feedback",
85-
classes: "nhsuk-button--secondary app-button--small"
85+
classes: "nhsuk-button--secondary nhsuk-button--small"
8686
}) }}
8787

8888

app/views/_feedback-report.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@ <h2 class="app-feedback-panel__title">You’ve just recorded your 5th vaccinatio
1616

1717
{{ button({
1818
text: "Very easy",
19-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
19+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
2020
attributes: {
2121
"data-thanks": "Thank you. Do you want to tell us more?"
2222
}
2323
}) }}
2424

2525
{{ button({
2626
text: "Easy",
27-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
27+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
2828
attributes: {
2929
"data-thanks": "Thank you. Do you want to tell us more?"
3030
}
3131
}) }}
3232

3333
{{ button({
3434
text: "Ok",
35-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
35+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
3636
attributes: {
3737
"data-thanks": "Thank you. Do you want to tell us more?"
3838
}
3939
}) }}
4040

4141
{{ button({
4242
text: "Difficult",
43-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
43+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
4444
attributes: {
4545
"data-thanks": "Thank you. Do you want to tell us more?"
4646
}
4747
}) }}
4848

4949
{{ button({
5050
text: "Very difficult",
51-
classes: "nhsuk-button--secondary app-button--small app-button--min-width",
51+
classes: "nhsuk-button--secondary nhsuk-button--small app-button--min-width",
5252
attributes: {
5353
"data-thanks": "Thank you. Do you want to tell us more?"
5454
}
@@ -82,7 +82,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
8282
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
8383
{{ button({
8484
text: "Send feedback",
85-
classes: "nhsuk-button--secondary app-button--small"
85+
classes: "nhsuk-button--secondary nhsuk-button--small"
8686
}) }}
8787

8888

app/views/_notification-90-days.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
4848
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
4949
{{ button({
5050
text: "Send feedback",
51-
classes: "nhsuk-button--secondary app-button--small"
51+
classes: "nhsuk-button--secondary nhsuk-button--small"
5252
}) }}
5353

5454

app/views/_notification-user-admin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
4646
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
4747
{{ button({
4848
text: "Send feedback",
49-
classes: "app-button--outlined app-button--small"
49+
classes: "app-button--outlined nhsuk-button--small"
5050
}) }}
5151

5252

app/views/_notification.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
4646
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
4747
{{ button({
4848
text: "Send feedback",
49-
classes: "nhsuk-button--secondary app-button--small"
49+
classes: "nhsuk-button--secondary nhsuk-button--small"
5050
}) }}
5151

5252

app/views/_report-notification.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2 class="app-feedback-panel__title">Thank you.</h2>
4747
<div class="nhsuk-button-group nhsuk-u-margin-bottom-0">
4848
{{ button({
4949
text: "Send feedback",
50-
classes: "app-button--outlined app-button--small"
50+
classes: "app-button--outlined nhsuk-button--small"
5151
}) }}
5252

5353

app/views/apply/start.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
4747
name: "organisationId",
4848
label: {
4949
text: "Find your pharmacy",
50-
classes: "nhsuk-label--m nhsuk-u-margin-bottom-1"
50+
size: "m"
5151
},
5252
hint: {
5353
text: "Search by name or ODS code"

app/views/apply/vaccine-types.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
fieldset: {
2222
legend: {
2323
text: pageName,
24-
classes: "nhsuk-fieldset__legend--l",
24+
size: "l",
2525
isPageHeading: true
2626
}
2727
},

0 commit comments

Comments
 (0)