Skip to content

Commit 1cb26c5

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
CCM-12090: Fix spacing
1 parent 67bba7a commit 1cb26c5

File tree

3 files changed

+117
-92
lines changed

3 files changed

+117
-92
lines changed

‎.gitleaksignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:15
77
b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:25
88
bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
99
bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25
10+
306d9ec55d3498b86d5506da9a90ac486fc66563:frontend/src/components/molecules/MessagePlanFallbackConditions/MessagePlanFallbackConditions.tsx:ipv4:92

‎frontend/src/__tests__/components/forms/LetterTemplateForm/__snapshots__/LetterTemplateForm.test.tsx.snap‎

Lines changed: 114 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -155,24 +155,28 @@ exports[`Client-side validation triggers 1`] = `
155155
/>
156156
</div>
157157
</div>
158-
<label
159-
class="nhsuk-label nhsuk-label--s"
160-
for="letterTemplateName"
161-
>
162-
Campaign
163-
</label>
164158
<div
165-
class="nhsuk-hint"
159+
class="nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
166160
>
167-
You currently only have one campaign:
161+
<label
162+
class="nhsuk-label nhsuk-label--s"
163+
for="letterTemplateName"
164+
>
165+
Campaign
166+
</label>
167+
<div
168+
class="nhsuk-hint"
169+
>
170+
You currently only have one campaign:
171+
</div>
172+
<input
173+
name="letterTemplateCampaignId"
174+
readonly=""
175+
type="hidden"
176+
value="campaign-id"
177+
/>
178+
campaign-id
168179
</div>
169-
<input
170-
name="letterTemplateCampaignId"
171-
readonly=""
172-
type="hidden"
173-
value="campaign-id"
174-
/>
175-
campaign-id
176180
<div
177181
class="nhsuk-form-group nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
178182
>
@@ -592,24 +596,28 @@ exports[`hides right-to-left language warning when language changes 1`] = `
592596
/>
593597
</div>
594598
</div>
595-
<label
596-
class="nhsuk-label nhsuk-label--s"
597-
for="letterTemplateName"
598-
>
599-
Campaign
600-
</label>
601599
<div
602-
class="nhsuk-hint"
600+
class="nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
603601
>
604-
You currently only have one campaign:
602+
<label
603+
class="nhsuk-label nhsuk-label--s"
604+
for="letterTemplateName"
605+
>
606+
Campaign
607+
</label>
608+
<div
609+
class="nhsuk-hint"
610+
>
611+
You currently only have one campaign:
612+
</div>
613+
<input
614+
name="letterTemplateCampaignId"
615+
readonly=""
616+
type="hidden"
617+
value="campaign-id"
618+
/>
619+
campaign-id
605620
</div>
606-
<input
607-
name="letterTemplateCampaignId"
608-
readonly=""
609-
type="hidden"
610-
value="campaign-id"
611-
/>
612-
campaign-id
613621
<div
614622
class="nhsuk-form-group nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
615623
>
@@ -1083,24 +1091,28 @@ exports[`renders page one error 1`] = `
10831091
/>
10841092
</div>
10851093
</div>
1086-
<label
1087-
class="nhsuk-label nhsuk-label--s"
1088-
for="letterTemplateName"
1089-
>
1090-
Campaign
1091-
</label>
10921094
<div
1093-
class="nhsuk-hint"
1095+
class="nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
10941096
>
1095-
You currently only have one campaign:
1097+
<label
1098+
class="nhsuk-label nhsuk-label--s"
1099+
for="letterTemplateName"
1100+
>
1101+
Campaign
1102+
</label>
1103+
<div
1104+
class="nhsuk-hint"
1105+
>
1106+
You currently only have one campaign:
1107+
</div>
1108+
<input
1109+
name="letterTemplateCampaignId"
1110+
readonly=""
1111+
type="hidden"
1112+
value="campaign-id"
1113+
/>
1114+
campaign-id
10961115
</div>
1097-
<input
1098-
name="letterTemplateCampaignId"
1099-
readonly=""
1100-
type="hidden"
1101-
value="campaign-id"
1102-
/>
1103-
campaign-id
11041116
<div
11051117
class="nhsuk-form-group nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
11061118
>
@@ -2067,24 +2079,28 @@ exports[`renders page with multiple errors 1`] = `
20672079
/>
20682080
</div>
20692081
</div>
2070-
<label
2071-
class="nhsuk-label nhsuk-label--s"
2072-
for="letterTemplateName"
2073-
>
2074-
Campaign
2075-
</label>
20762082
<div
2077-
class="nhsuk-hint"
2083+
class="nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
20782084
>
2079-
You currently only have one campaign:
2085+
<label
2086+
class="nhsuk-label nhsuk-label--s"
2087+
for="letterTemplateName"
2088+
>
2089+
Campaign
2090+
</label>
2091+
<div
2092+
class="nhsuk-hint"
2093+
>
2094+
You currently only have one campaign:
2095+
</div>
2096+
<input
2097+
name="letterTemplateCampaignId"
2098+
readonly=""
2099+
type="hidden"
2100+
value="campaign-id"
2101+
/>
2102+
campaign-id
20802103
</div>
2081-
<input
2082-
name="letterTemplateCampaignId"
2083-
readonly=""
2084-
type="hidden"
2085-
value="campaign-id"
2086-
/>
2087-
campaign-id
20882104
<div
20892105
class="nhsuk-form-group nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
20902106
>
@@ -2514,24 +2530,28 @@ exports[`renders page with preloaded field values 1`] = `
25142530
/>
25152531
</div>
25162532
</div>
2517-
<label
2518-
class="nhsuk-label nhsuk-label--s"
2519-
for="letterTemplateName"
2520-
>
2521-
Campaign
2522-
</label>
25232533
<div
2524-
class="nhsuk-hint"
2534+
class="nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
25252535
>
2526-
You currently only have one campaign:
2536+
<label
2537+
class="nhsuk-label nhsuk-label--s"
2538+
for="letterTemplateName"
2539+
>
2540+
Campaign
2541+
</label>
2542+
<div
2543+
class="nhsuk-hint"
2544+
>
2545+
You currently only have one campaign:
2546+
</div>
2547+
<input
2548+
name="letterTemplateCampaignId"
2549+
readonly=""
2550+
type="hidden"
2551+
value="campaign-id"
2552+
/>
2553+
campaign-id
25272554
</div>
2528-
<input
2529-
name="letterTemplateCampaignId"
2530-
readonly=""
2531-
type="hidden"
2532-
value="campaign-id"
2533-
/>
2534-
campaign-id
25352555
<div
25362556
class="nhsuk-form-group nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
25372557
>
@@ -2969,24 +2989,28 @@ exports[`shows right-to-left language warning when language changes 1`] = `
29692989
/>
29702990
</div>
29712991
</div>
2972-
<label
2973-
class="nhsuk-label nhsuk-label--s"
2974-
for="letterTemplateName"
2975-
>
2976-
Campaign
2977-
</label>
29782992
<div
2979-
class="nhsuk-hint"
2993+
class="nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
29802994
>
2981-
You currently only have one campaign:
2995+
<label
2996+
class="nhsuk-label nhsuk-label--s"
2997+
for="letterTemplateName"
2998+
>
2999+
Campaign
3000+
</label>
3001+
<div
3002+
class="nhsuk-hint"
3003+
>
3004+
You currently only have one campaign:
3005+
</div>
3006+
<input
3007+
name="letterTemplateCampaignId"
3008+
readonly=""
3009+
type="hidden"
3010+
value="campaign-id"
3011+
/>
3012+
campaign-id
29823013
</div>
2983-
<input
2984-
name="letterTemplateCampaignId"
2985-
readonly=""
2986-
type="hidden"
2987-
value="campaign-id"
2988-
/>
2989-
campaign-id
29903014
<div
29913015
class="nhsuk-form-group nhsuk-u-margin-bottom-6 nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2"
29923016
>

‎frontend/src/components/forms/LetterTemplateForm/LetterTemplateForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export const LetterTemplateForm: FC<
146146
/>
147147
</div>
148148
{campaignIds.length === 1 ? (
149-
<>
149+
<div className={classNames(...formGroupClasses)}>
150150
<Label htmlFor='letterTemplateName' size='s'>
151151
{campaignLabelText}
152152
</Label>
@@ -158,7 +158,7 @@ export const LetterTemplateForm: FC<
158158
readOnly
159159
/>
160160
{letterTemplateCampaignId}
161-
</>
161+
</div>
162162
) : (
163163
<Select
164164
formGroupProps={{

0 commit comments

Comments
 (0)