Skip to content

Commit fa2dd2c

Browse files
committed
FInish up initial punt
1 parent f66c6d7 commit fa2dd2c

2 files changed

Lines changed: 38 additions & 29 deletions

File tree

app/assets/sass/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787

8888
.app-simple-progress-bar {
8989
width: 100%;
90-
height: 2.5rem;
90+
height: 3rem;
9191

9292
&.--standard {
9393
background: var(--standard-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;

app/views/batches/batch-new.html

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h1 class="nhsuk-heading-l nhsuk-u-margin-bottom-1">
5757
<span class="nhsuk-caption-m">Standard (NTDD) batch imported 1st January 2026</span>
5858
</div>
5959
</div>
60-
60+
6161
<div class="nhsuk-grid-row">
6262
<div class="nhsuk-grid-column-one-quarter">
6363
<div class="nhsuk-card nhsuk-card--clickable">
@@ -80,18 +80,18 @@ <h2 class="nhsuk-card__heading nhsuk-u-font-size-36 nhsuk-u-margin-bottom-1">
8080
</div>
8181

8282
</section>
83-
83+
8484
<hr class="nhsuk-u-margin-0 nhsuk-u-margin-bottom-4">
85-
85+
8686
<section>
8787
<div class="nhsuk-grid-row">
8888
<div class="nhsuk-grid-column-full">
89-
89+
9090
<h2 class="nhsuk-heading-m">Participant breakdown</h2>
91-
91+
9292
<figure class="app-chart-bar-segmented-horizontal">
9393
<figcaption class="nhsuk-u-visually-hidden">Participant breakdown by type</figcaption>
94-
94+
9595
<style>
9696
/* Each row takes up an equal share — adjust flex values to reflect real proportions */
9797
tbody tr:nth-child(1) {
@@ -104,7 +104,7 @@ <h2 class="nhsuk-heading-m">Participant breakdown</h2>
104104
flex: 5;
105105
}
106106
</style>
107-
107+
108108
<table aria-describedby="chart-key" class="nhsuk-u-margin-bottom-4">
109109
<thead class="nhsuk-u-visually-hidden">
110110
<tr>
@@ -148,7 +148,7 @@ <h2 class="nhsuk-heading-m">Participant breakdown</h2>
148148
</tr>
149149
</tbody>
150150
</table>
151-
151+
152152
<ul id="chart-key" aria-label="Chart key" class="nhsuk-list nhsuk-u-margin-0 app-chart-bar-segmented-horizontal--legend">
153153
<li>
154154
<div class="swatch hatching--standard" aria-hidden="true"></div>
@@ -172,11 +172,11 @@ <h2 class="nhsuk-heading-m">Participant breakdown</h2>
172172
</div>
173173
</li>
174174
</ul>
175-
175+
176176
</figure>
177177
</div>
178178
</div>
179-
179+
180180
<div class="nhsuk-grid-row">
181181
<div class="nhsuk-grid-column-full">
182182
<h3 class="nhsuk-heading-s">Participant distribution by next test due date</h3>
@@ -210,9 +210,9 @@ <h3 class="nhsuk-heading-xs nhsuk-u-font-weight-normal">
210210
</div>
211211
</div>
212212
</section>
213-
213+
214214
<hr class="nhsuk-u-margin-0 nhsuk-u-margin-bottom-4">
215-
215+
216216
<section>
217217
<div class="nhsuk-grid-row">
218218
<div class="nhsuk-grid-column-full">
@@ -232,42 +232,48 @@ <h3 class="nhsuk-heading-s">
232232
-->
233233
</div>
234234
</div>
235-
235+
236236
<div class="nhsuk-grid-row">
237237
<div class="nhsuk-grid-column-full nhsuk-u-margin-bottom-2">
238238
<a href="#" class="nhsuk-u-font-size-19">Standard</a>
239239
</div>
240240
</div>
241241
<div class="nhsuk-grid-row nhsuk-u-margin-bottom-3">
242242
<div class="nhsuk-grid-column-two-thirds">
243-
<div class="app-simple-progress-bar --standard" style="--percentage: 0%;">
244-
<span class="nhsuk-u-visually-hidden">0% appointed</span>
243+
<div class="app-simple-progress-bar --standard nhsuk-u-padding-top-2" style="--percentage: 0%;">
244+
{{ tag({
245+
text: "0% appointed",
246+
classes: "nhsuk-tag--green nhsuk-u-margin-left-2"
247+
}) }}
245248
</div>
246249
</div>
247250
<div class="nhsuk-grid-column-one-third">
248-
<p class="nhsuk-u-margin-0">0 of 1970 appointed</p>
251+
<p class="nhsuk-u-margin-0 nhsuk-u-padding-top-2">0 of 1970 appointed</p>
249252
</div>
250253
</div>
251-
252-
254+
255+
253256
<div class="nhsuk-grid-row">
254257
<div class="nhsuk-grid-column-full nhsuk-u-margin-bottom-2">
255258
<a href="#" class="nhsuk-u-font-size-19">Special requirements</a>
256259
</div>
257260
</div>
258261
<div class="nhsuk-grid-row">
259262
<div class="nhsuk-grid-column-two-thirds">
260-
<div class="app-simple-progress-bar --special" style="--percentage: 0%;">
261-
<span class="nhsuk-u-visually-hidden">0% appointed</span>
263+
<div class="app-simple-progress-bar --special nhsuk-u-padding-top-2" style="--percentage: 0%;">
264+
{{ tag({
265+
text: "0% appointed",
266+
classes: "nhsuk-tag--orange nhsuk-u-margin-left-2"
267+
}) }}
262268
</div>
263269
</div>
264270
<div class="nhsuk-grid-column-one-third">
265-
<p class="nhsuk-u-margin-0">0 of 12 appointed</p>
271+
<p class="nhsuk-u-margin-0 nhsuk-u-padding-top-2">0 of 12 appointed</p>
266272
</div>
267273
</div>
268-
269-
270-
274+
275+
276+
271277
<div class="nhsuk-grid-row">
272278
<div class="nhsuk-grid-column-full nhsuk-u-margin-bottom-2">
273279
<h2 class="nhsuk-heading-s nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-2">Reconciliation</h2>
@@ -276,16 +282,19 @@ <h2 class="nhsuk-heading-s nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-2">Reconci
276282
</div>
277283
<div class="nhsuk-grid-row">
278284
<div class="nhsuk-grid-column-two-thirds">
279-
<div class="app-simple-progress-bar --vhr" style="--percentage: 0%;">
280-
<span class="nhsuk-u-visually-hidden">0% reconciled</span>
285+
<div class="app-simple-progress-bar --vhr nhsuk-u-padding-top-2" style="--percentage: 0%;">
286+
{{ tag({
287+
text: "0% reconciled",
288+
classes: "nhsuk-tag--red nhsuk-u-margin-left-2"
289+
}) }}
281290
</div>
282291
</div>
283292
<div class="nhsuk-grid-column-one-third">
284-
<p class="nhsuk-u-margin-0">0 of 5 reconciled</p>
293+
<p class="nhsuk-u-margin-0 nhsuk-u-padding-top-2">0 of 5 reconciled</p>
285294
</div>
286295
</div>
287296
</section>
288-
297+
289298
<hr class="nhsuk-u-margin-0 nhsuk-u-margin-top-6 nhsuk-u-margin-bottom-4">
290299

291300
<section>

0 commit comments

Comments
 (0)