Skip to content

Commit f08421a

Browse files
harrim91harrim91
authored
Merge pull request #281 from NHSDigital/feature/CCM-8023-login-link-text
CCM-8023: lots of styling/content tweaks
2 parents e040c9a + aa702b1 commit f08421a

File tree

80 files changed

+9131
-8802
lines changed

Some content is hidden

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

80 files changed

+9131
-8802
lines changed

‎frontend/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"nhs-notify-backend-client": "*",
3131
"nhs-notify-web-template-management-amplify": "*",
3232
"nhs-notify-web-template-management-utils": "*",
33-
"nhsuk-frontend": "^8.3.0",
34-
"nhsuk-react-components": "^4.1.1",
33+
"nhsuk-frontend": "^9.1.0",
34+
"nhsuk-react-components": "^5.0.0",
3535
"path": "^0.12.7",
3636
"react": "^18",
3737
"react-dom": "^18",

‎frontend/public/lib/nhsuk-8.3.0.min.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎frontend/public/lib/nhsuk-8.3.0.min.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎frontend/public/lib/nhsuk-9.1.0.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/public/lib/nhsuk-9.1.0.min.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/public/lib/nhsuk.min.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎frontend/src/__tests__/app/choose-a-template-type/__snapshots__/page.test.tsx.snap‎

Lines changed: 126 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -3,149 +3,151 @@
33
exports[`ChooseATemplateTypePage 1`] = `
44
<DocumentFragment>
55
<div
6-
class="nhsuk-grid-row"
6+
class="nhsuk-back-link"
77
>
8-
<div
9-
class="nhsuk-back-link"
8+
<a
9+
class="nhsuk-back-link__link"
10+
href="/templates/manage-templates"
1011
>
11-
<a
12-
class="nhsuk-back-link__link nhsuk-u-margin-bottom-5 nhsuk-u-margin-left-3"
13-
href="/templates/manage-templates"
12+
<svg
13+
aria-hidden="true"
14+
class="nhsuk-icon nhsuk-icon__chevron-left"
15+
height="24"
16+
viewBox="0 0 24 24"
17+
width="24"
18+
xmlns="http://www.w3.org/2000/svg"
1419
>
15-
<svg
16-
aria-hidden="true"
17-
class="nhsuk-icon nhsuk-icon__chevron-left"
18-
height="24"
19-
viewBox="0 0 24 24"
20-
width="24"
21-
xmlns="http://www.w3.org/2000/svg"
22-
>
23-
<path
24-
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
25-
/>
26-
</svg>
27-
Back to all templates
28-
</a>
29-
</div>
20+
<path
21+
d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"
22+
/>
23+
</svg>
24+
Back to all templates
25+
</a>
3026
</div>
31-
<form
32-
action="/action"
27+
<main
28+
class="nhsuk-main-wrapper"
29+
id="maincontent"
30+
role="main"
3331
>
34-
<input
35-
name="form-id"
36-
readonly=""
37-
type="hidden"
38-
value="choose-a-template-type"
39-
/>
40-
<div
41-
class="nhsuk-form-group"
32+
<form
33+
action="/action"
4234
>
43-
<fieldset
44-
class="nhsuk-fieldset"
35+
<input
36+
name="form-id"
37+
readonly=""
38+
type="hidden"
39+
value="choose-a-template-type"
40+
/>
41+
<div
42+
class="nhsuk-form-group"
4543
>
46-
<legend
47-
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l"
48-
data-testid="templateType-form__legend"
49-
>
50-
<h1
51-
class="nhsuk-fieldset__heading"
52-
>
53-
Choose a template type to create
54-
</h1>
55-
</legend>
56-
<p>
57-
<a
58-
href="/features"
59-
rel="noopener noreferrer"
60-
target="_blank"
61-
>
62-
Learn more about message channels (opens in a new tab)
63-
</a>
64-
</p>
65-
<div
66-
class="nhsuk-form-group"
44+
<fieldset
45+
class="nhsuk-fieldset"
6746
>
68-
<div
69-
class="nhsuk-hint"
70-
id="templateType--hint"
47+
<legend
48+
class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l"
49+
data-testid="templateType-form__legend"
7150
>
72-
Select one option
73-
</div>
51+
<h1
52+
class="nhsuk-fieldset__heading"
53+
>
54+
Choose a template type to create
55+
</h1>
56+
</legend>
57+
<p>
58+
<a
59+
href="/features"
60+
rel="noopener noreferrer"
61+
target="_blank"
62+
>
63+
Learn more about message channels (opens in a new tab)
64+
</a>
65+
</p>
7466
<div
75-
aria-describedby="templateType--hint"
76-
class="nhsuk-radios"
77-
id="templateType"
67+
class="nhsuk-form-group"
7868
>
7969
<div
80-
class="nhsuk-radios__item"
70+
class="nhsuk-hint"
71+
id="templateType--hint"
8172
>
82-
<input
83-
class="nhsuk-radios__input"
84-
data-testid="NHS_APP-radio"
85-
id="templateType-NHS_APP"
86-
name="templateType"
87-
type="radio"
88-
value="NHS_APP"
89-
/>
90-
<label
91-
class="nhsuk-label nhsuk-radios__label"
92-
for="templateType-NHS_APP"
93-
id="templateType-NHS_APP--label"
94-
>
95-
NHS App message
96-
</label>
73+
Select one option
9774
</div>
9875
<div
99-
class="nhsuk-radios__item"
76+
aria-describedby="templateType--hint"
77+
class="nhsuk-radios"
78+
id="templateType"
10079
>
101-
<input
102-
class="nhsuk-radios__input"
103-
data-testid="EMAIL-radio"
104-
id="templateType-EMAIL"
105-
name="templateType"
106-
type="radio"
107-
value="EMAIL"
108-
/>
109-
<label
110-
class="nhsuk-label nhsuk-radios__label"
111-
for="templateType-EMAIL"
112-
id="templateType-EMAIL--label"
80+
<div
81+
class="nhsuk-radios__item"
11382
>
114-
Email
115-
</label>
116-
</div>
117-
<div
118-
class="nhsuk-radios__item"
119-
>
120-
<input
121-
class="nhsuk-radios__input"
122-
data-testid="SMS-radio"
123-
id="templateType-SMS"
124-
name="templateType"
125-
type="radio"
126-
value="SMS"
127-
/>
128-
<label
129-
class="nhsuk-label nhsuk-radios__label"
130-
for="templateType-SMS"
131-
id="templateType-SMS--label"
83+
<input
84+
class="nhsuk-radios__input"
85+
data-testid="NHS_APP-radio"
86+
id="templateType-NHS_APP"
87+
name="templateType"
88+
type="radio"
89+
value="NHS_APP"
90+
/>
91+
<label
92+
class="nhsuk-label nhsuk-radios__label"
93+
for="templateType-NHS_APP"
94+
id="templateType-NHS_APP--label"
95+
>
96+
NHS App message
97+
</label>
98+
</div>
99+
<div
100+
class="nhsuk-radios__item"
132101
>
133-
Text message (SMS)
134-
</label>
102+
<input
103+
class="nhsuk-radios__input"
104+
data-testid="EMAIL-radio"
105+
id="templateType-EMAIL"
106+
name="templateType"
107+
type="radio"
108+
value="EMAIL"
109+
/>
110+
<label
111+
class="nhsuk-label nhsuk-radios__label"
112+
for="templateType-EMAIL"
113+
id="templateType-EMAIL--label"
114+
>
115+
Email
116+
</label>
117+
</div>
118+
<div
119+
class="nhsuk-radios__item"
120+
>
121+
<input
122+
class="nhsuk-radios__input"
123+
data-testid="SMS-radio"
124+
id="templateType-SMS"
125+
name="templateType"
126+
type="radio"
127+
value="SMS"
128+
/>
129+
<label
130+
class="nhsuk-label nhsuk-radios__label"
131+
for="templateType-SMS"
132+
id="templateType-SMS--label"
133+
>
134+
Text message (SMS)
135+
</label>
136+
</div>
135137
</div>
136138
</div>
137-
</div>
138-
</fieldset>
139-
</div>
140-
<button
141-
aria-disabled="false"
142-
class="nhsuk-button"
143-
data-testid="submit-button"
144-
id="choose-a-template-type-submit-button"
145-
type="submit"
146-
>
147-
Continue
148-
</button>
149-
</form>
139+
</fieldset>
140+
</div>
141+
<button
142+
aria-disabled="false"
143+
class="nhsuk-button"
144+
data-testid="submit-button"
145+
id="choose-a-template-type-submit-button"
146+
type="submit"
147+
>
148+
Continue
149+
</button>
150+
</form>
151+
</main>
150152
</DocumentFragment>
151153
`;

0 commit comments

Comments
 (0)