Skip to content

Commit f8fcfb7

Browse files
author
Fawad Ali
committed
CCM-5756: rename button and style labels
1 parent 9e776f2 commit f8fcfb7

File tree

7 files changed

+52
-47
lines changed

7 files changed

+52
-47
lines changed

‎src/__tests__/components/forms/CreateEmailTemplate/__snapshots__/CreateEmailTemplate.test.tsx.snap‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ exports[`renders page 1`] = `
7575
>
7676
<div>
7777
<label
78-
class="nhsuk-label"
78+
class="nhsuk-label nhsuk-label--s"
7979
for="emailTemplateName"
8080
>
8181
Template name
@@ -147,7 +147,7 @@ exports[`renders page 1`] = `
147147
>
148148
<div>
149149
<label
150-
class="nhsuk-label"
150+
class="nhsuk-label nhsuk-label--s"
151151
for="emailTemplateSubjectLine"
152152
>
153153
Subject line
@@ -169,7 +169,7 @@ exports[`renders page 1`] = `
169169
class="nhsuk-form-group"
170170
>
171171
<label
172-
class="nhsuk-label"
172+
class="nhsuk-label nhsuk-label--s"
173173
for="emailTemplateMessage"
174174
id="emailTemplateMessage--label"
175175
>
@@ -190,7 +190,7 @@ exports[`renders page 1`] = `
190190
id="create-email-template-submit-button"
191191
type="submit"
192192
>
193-
Continue
193+
Save and preview
194194
</button>
195195
</form>
196196
</div>
@@ -650,7 +650,7 @@ exports[`renders page one error 1`] = `
650650
class="nhsuk-form-group--error"
651651
>
652652
<label
653-
class="nhsuk-label"
653+
class="nhsuk-label nhsuk-label--s"
654654
for="emailTemplateName"
655655
>
656656
Template name
@@ -734,7 +734,7 @@ exports[`renders page one error 1`] = `
734734
>
735735
<div>
736736
<label
737-
class="nhsuk-label"
737+
class="nhsuk-label nhsuk-label--s"
738738
for="emailTemplateSubjectLine"
739739
>
740740
Subject line
@@ -756,7 +756,7 @@ exports[`renders page one error 1`] = `
756756
class="nhsuk-form-group"
757757
>
758758
<label
759-
class="nhsuk-label"
759+
class="nhsuk-label nhsuk-label--s"
760760
for="emailTemplateMessage"
761761
id="emailTemplateMessage--label"
762762
>
@@ -777,7 +777,7 @@ exports[`renders page one error 1`] = `
777777
id="create-email-template-submit-button"
778778
type="submit"
779779
>
780-
Continue
780+
Save and preview
781781
</button>
782782
</form>
783783
</div>
@@ -1241,7 +1241,7 @@ exports[`renders page with multiple errors 1`] = `
12411241
class="nhsuk-form-group--error"
12421242
>
12431243
<label
1244-
class="nhsuk-label"
1244+
class="nhsuk-label nhsuk-label--s"
12451245
for="emailTemplateName"
12461246
>
12471247
Template name
@@ -1327,7 +1327,7 @@ exports[`renders page with multiple errors 1`] = `
13271327
class="nhsuk-form-group--error"
13281328
>
13291329
<label
1330-
class="nhsuk-label"
1330+
class="nhsuk-label nhsuk-label--s"
13311331
for="emailTemplateSubjectLine"
13321332
>
13331333
Subject line
@@ -1361,7 +1361,7 @@ exports[`renders page with multiple errors 1`] = `
13611361
class="nhsuk-form-group nhsuk-form-group--error"
13621362
>
13631363
<label
1364-
class="nhsuk-label"
1364+
class="nhsuk-label nhsuk-label--s"
13651365
for="emailTemplateMessage"
13661366
id="emailTemplateMessage--label"
13671367
>
@@ -1394,7 +1394,7 @@ exports[`renders page with multiple errors 1`] = `
13941394
id="create-email-template-submit-button"
13951395
type="submit"
13961396
>
1397-
Continue
1397+
Save and preview
13981398
</button>
13991399
</form>
14001400
</div>
@@ -1817,7 +1817,7 @@ exports[`renders page with preloaded field values 1`] = `
18171817
>
18181818
<div>
18191819
<label
1820-
class="nhsuk-label"
1820+
class="nhsuk-label nhsuk-label--s"
18211821
for="emailTemplateName"
18221822
>
18231823
Template name
@@ -1889,7 +1889,7 @@ exports[`renders page with preloaded field values 1`] = `
18891889
>
18901890
<div>
18911891
<label
1892-
class="nhsuk-label"
1892+
class="nhsuk-label nhsuk-label--s"
18931893
for="emailTemplateSubjectLine"
18941894
>
18951895
Subject line
@@ -1911,7 +1911,7 @@ exports[`renders page with preloaded field values 1`] = `
19111911
class="nhsuk-form-group"
19121912
>
19131913
<label
1914-
class="nhsuk-label"
1914+
class="nhsuk-label nhsuk-label--s"
19151915
for="emailTemplateMessage"
19161916
id="emailTemplateMessage--label"
19171917
>
@@ -1934,7 +1934,7 @@ exports[`renders page with preloaded field values 1`] = `
19341934
id="create-email-template-submit-button"
19351935
type="submit"
19361936
>
1937-
Continue
1937+
Save and preview
19381938
</button>
19391939
</form>
19401940
</div>

‎src/__tests__/components/forms/CreateNhsAppTemplate/__snapshots__/CreateNhsAppTemplate.test.tsx.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports[`renders page 1`] = `
6767
</h1>
6868
<div>
6969
<label
70-
class="nhsuk-label"
70+
class="nhsuk-label nhsuk-label--s"
7171
for="nhsAppTemplateName"
7272
>
7373
Template name
@@ -136,7 +136,7 @@ exports[`renders page 1`] = `
136136
class="nhsuk-form-group"
137137
>
138138
<label
139-
class="nhsuk-label"
139+
class="nhsuk-label nhsuk-label--s"
140140
for="nhsAppTemplateMessage"
141141
id="nhsAppTemplateMessage--label"
142142
>
@@ -162,7 +162,7 @@ exports[`renders page 1`] = `
162162
id="create-nhs-app-template-submit-button"
163163
type="submit"
164164
>
165-
Continue
165+
Save and preview
166166
</button>
167167
</form>
168168
</div>
@@ -519,7 +519,7 @@ exports[`renders page one error 1`] = `
519519
class="nhsuk-form-group--error"
520520
>
521521
<label
522-
class="nhsuk-label"
522+
class="nhsuk-label nhsuk-label--s"
523523
for="nhsAppTemplateName"
524524
>
525525
Template name
@@ -600,7 +600,7 @@ exports[`renders page one error 1`] = `
600600
class="nhsuk-form-group"
601601
>
602602
<label
603-
class="nhsuk-label"
603+
class="nhsuk-label nhsuk-label--s"
604604
for="nhsAppTemplateMessage"
605605
id="nhsAppTemplateMessage--label"
606606
>
@@ -626,7 +626,7 @@ exports[`renders page one error 1`] = `
626626
id="create-nhs-app-template-submit-button"
627627
type="submit"
628628
>
629-
Continue
629+
Save and preview
630630
</button>
631631
</form>
632632
</div>
@@ -985,7 +985,7 @@ exports[`renders page with multiple errors 1`] = `
985985
class="nhsuk-form-group--error"
986986
>
987987
<label
988-
class="nhsuk-label"
988+
class="nhsuk-label nhsuk-label--s"
989989
for="nhsAppTemplateName"
990990
>
991991
Template name
@@ -1066,7 +1066,7 @@ exports[`renders page with multiple errors 1`] = `
10661066
class="nhsuk-form-group nhsuk-form-group--error"
10671067
>
10681068
<label
1069-
class="nhsuk-label"
1069+
class="nhsuk-label nhsuk-label--s"
10701070
for="nhsAppTemplateMessage"
10711071
id="nhsAppTemplateMessage--label"
10721072
>
@@ -1104,7 +1104,7 @@ exports[`renders page with multiple errors 1`] = `
11041104
id="create-nhs-app-template-submit-button"
11051105
type="submit"
11061106
>
1107-
Continue
1107+
Save and preview
11081108
</button>
11091109
</form>
11101110
</div>
@@ -1429,7 +1429,7 @@ exports[`renders page with preloaded field values 1`] = `
14291429
</h1>
14301430
<div>
14311431
<label
1432-
class="nhsuk-label"
1432+
class="nhsuk-label nhsuk-label--s"
14331433
for="nhsAppTemplateName"
14341434
>
14351435
Template name
@@ -1498,7 +1498,7 @@ exports[`renders page with preloaded field values 1`] = `
14981498
class="nhsuk-form-group"
14991499
>
15001500
<label
1501-
class="nhsuk-label"
1501+
class="nhsuk-label nhsuk-label--s"
15021502
for="nhsAppTemplateMessage"
15031503
id="nhsAppTemplateMessage--label"
15041504
>
@@ -1526,7 +1526,7 @@ exports[`renders page with preloaded field values 1`] = `
15261526
id="create-nhs-app-template-submit-button"
15271527
type="submit"
15281528
>
1529-
Continue
1529+
Save and preview
15301530
</button>
15311531
</form>
15321532
</div>

‎src/__tests__/components/forms/CreateSmsTemplate/__snapshots__/CreateSmsTemplate.test.tsx.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
6666
/>
6767
<div>
6868
<label
69-
class="nhsuk-label"
69+
class="nhsuk-label nhsuk-label--s"
7070
for="smsTemplateName"
7171
>
7272
Template name
@@ -135,7 +135,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
135135
class="nhsuk-form-group"
136136
>
137137
<label
138-
class="nhsuk-label"
138+
class="nhsuk-label nhsuk-label--s"
139139
for="smsTemplateMessage"
140140
id="smsTemplateMessage--label"
141141
>
@@ -179,7 +179,7 @@ exports[`CreateSmsTemplate component renders page 1`] = `
179179
id="create-sms-template-submit-button"
180180
type="submit"
181181
>
182-
Continue
182+
Save and preview
183183
</button>
184184
</form>
185185
</div>
@@ -408,7 +408,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
408408
class="nhsuk-form-group--error"
409409
>
410410
<label
411-
class="nhsuk-label"
411+
class="nhsuk-label nhsuk-label--s"
412412
for="smsTemplateName"
413413
>
414414
Template name
@@ -489,7 +489,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
489489
class="nhsuk-form-group"
490490
>
491491
<label
492-
class="nhsuk-label"
492+
class="nhsuk-label nhsuk-label--s"
493493
for="smsTemplateMessage"
494494
id="smsTemplateMessage--label"
495495
>
@@ -533,7 +533,7 @@ exports[`CreateSmsTemplate component renders page one error 1`] = `
533533
id="create-sms-template-submit-button"
534534
type="submit"
535535
>
536-
Continue
536+
Save and preview
537537
</button>
538538
</form>
539539
</div>
@@ -764,7 +764,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
764764
class="nhsuk-form-group--error"
765765
>
766766
<label
767-
class="nhsuk-label"
767+
class="nhsuk-label nhsuk-label--s"
768768
for="smsTemplateName"
769769
>
770770
Template name
@@ -845,7 +845,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
845845
class="nhsuk-form-group nhsuk-form-group--error"
846846
>
847847
<label
848-
class="nhsuk-label"
848+
class="nhsuk-label nhsuk-label--s"
849849
for="smsTemplateMessage"
850850
id="smsTemplateMessage--label"
851851
>
@@ -901,7 +901,7 @@ exports[`CreateSmsTemplate component renders page with multiple errors 1`] = `
901901
id="create-sms-template-submit-button"
902902
type="submit"
903903
>
904-
Continue
904+
Save and preview
905905
</button>
906906
</form>
907907
</div>
@@ -1098,7 +1098,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
10981098
/>
10991099
<div>
11001100
<label
1101-
class="nhsuk-label"
1101+
class="nhsuk-label nhsuk-label--s"
11021102
for="smsTemplateName"
11031103
>
11041104
Template name
@@ -1167,7 +1167,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
11671167
class="nhsuk-form-group"
11681168
>
11691169
<label
1170-
class="nhsuk-label"
1170+
class="nhsuk-label nhsuk-label--s"
11711171
for="smsTemplateMessage"
11721172
id="smsTemplateMessage--label"
11731173
>
@@ -1213,7 +1213,7 @@ exports[`CreateSmsTemplate component renders page with preloaded field values 1`
12131213
id="create-sms-template-submit-button"
12141214
type="submit"
12151215
>
1216-
Continue
1216+
Save and preview
12171217
</button>
12181218
</form>
12191219
</div>

‎src/components/forms/CreateEmailTemplate/CreateEmailTemplate.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ export const CreateEmailTemplate: FC<PageComponentProps> = ({
8484

8585
<FormSection>
8686
<div className={templateNameError && 'nhsuk-form-group--error'}>
87-
<Label htmlFor='emailTemplateName'>{templateNameLabelText}</Label>
87+
<Label htmlFor='emailTemplateName' size='s'>
88+
{templateNameLabelText}
89+
</Label>
8890
<HintText>{templateNameHintText}</HintText>
8991
<TemplateNameGuidance template={TemplateType.EMAIL} />
9092
<TextInput
@@ -102,7 +104,7 @@ export const CreateEmailTemplate: FC<PageComponentProps> = ({
102104
<div
103105
className={templateSubjectLineError && 'nhsuk-form-group--error'}
104106
>
105-
<Label htmlFor='emailTemplateSubjectLine'>
107+
<Label htmlFor='emailTemplateSubjectLine' size='s'>
106108
{templateSubjectLineLabelText}
107109
</Label>
108110
<TextInput
@@ -117,6 +119,7 @@ export const CreateEmailTemplate: FC<PageComponentProps> = ({
117119

118120
<Textarea
119121
label={templateMessageLabelText}
122+
labelProps={{ size: 's' }}
120123
id='emailTemplateMessage'
121124
rows={10}
122125
onChange={emailTemplateMessageHandler}

0 commit comments

Comments
 (0)