@@ -243,29 +243,29 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
243
243
{% for section in sections %}
244
244
< tbody class ="table-question-council__section ">
245
245
246
- {% if section.has_negative_points %}
247
- < tr data-has-plan ="no " class ="section-row bg-red-100 text-red-900 ">
248
- {% else %}
249
- < tr data-has-plan ="no " class ="section-row bg-primary-100 ">
250
- {% endif %}
246
+ < tr data-has-plan ="no " class ="section-row fw-bold ">
251
247
252
- < td colspan ="1 " class ="section-cell border-bottom border-end border-opacity-25 border-primary text-start ">
248
+ < td colspan ="1 " class ="section-cell border-bottom border-start border- end border-opacity-25 border-primary text-start ">
253
249
{{ section.description }}
254
250
255
251
{% if section.has_negative_points %}
256
- < div class ="d-flex flex-column mb-0 mt-2 fs-7 text-warning ">
252
+ < div class ="d-flex flex-column mb-0 mt-2 fs-7 rounded p-2 bg-red-100 text-warning ">
257
253
< p class ="mb-1 ">
258
254
{% include 'caps/icons/warning.html' with classes='me-1 mb-1' width='1.1em' height='1.1em' role='presentation' %}
259
255
< strong class ="me-2 "> Penalty marks</ strong >
260
256
</ p >
261
- {% if section.only_negative %}
262
- {{ council.name }} was only awarded penalty marks in this section
263
- {% else %}
264
- {{ council.name }} incurred a penalty of {{ section.negative_percent|floatformat:0 }}% in this section
265
- {% endif %}
257
+ < p class ="fw-normal mb-1 ">
258
+ {% if section.only_negative %}
259
+ {{ council.name }} was only awarded penalty marks in this section
260
+ {% else %}
261
+ {{ council.name }} incurred a penalty of {{ section.negative_percent|floatformat:0 }}% in this section
262
+ {% endif %}
263
+ </ p >
264
+ < p class ="fw-normal mt-1 mb-0 ">
265
+ {{ section.score }} = Total score ({{ section.non_negative_max|floatformat:"-2" }}) − Penalty points ({{ section.negative_points }})
266
+ </ p >
266
267
</ div >
267
268
{% endif %}
268
-
269
269
< button type ="button " class ="d-block mt-2 d-md-none btn btn-outline-primary btn-sm js-toggle-council-question-table-section rounded-0 " aria-label ="Expand this section " title ="Expand this section ">
270
270
{% include 'caps/icons/chevron-down.html' with classes='align-text-bottom' width='1.2em' height='1.2em' role='presentation' %}
271
271
Show questions
@@ -294,11 +294,6 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
294
294
<!-- TODO: If there is no variation then display '-' -->
295
295
<!-- TODO Designer: Add tooltip to badge explaining this is a variation -->
296
296
< p class ="badge small ms-1 mb-0 align-text-bottom bg-green-100 text-success "> +5%</ p >
297
- {% if section.has_negative_points %}
298
- < div class ="fs-7 mt-2 ">
299
- {{ section.score }} = Total score ({{ section.non_negative_max|floatformat:"-2" }}) − Penalty points ({{ section.negative_points }})
300
- </ div >
301
- {% endif %}
302
297
</ td >
303
298
{% endif %}
304
299
@@ -316,7 +311,7 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
316
311
</ td >
317
312
{% endfor %}
318
313
319
- < td class ="d-none d-md-table-cell top-tier-score border-bottom border-opacity-25 border-primary "> </ td >
314
+ < td class ="d-none d-md-table-cell top-tier-score border-end border- bottom border-opacity-25 border-primary "> </ td >
320
315
321
316
< td class ="button-wrapper p-0 bg-white d-none d-md-table-cell text-start ">
322
317
< button type ="button " class ="btn btn-outline-primary js-toggle-council-question-table-section border-start-0 rounded-0 " aria-label ="Expand this section " title ="Expand this section ">
@@ -377,8 +372,8 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
377
372
{% endfor %}
378
373
379
374
< tbody class ="table-question-council__section ">
380
- < tr data-has-plan ="no " class ="section-row bg-purple-200 fw-bold ">
381
- < td colspan ="1 " class ="section-cell border-bottom border-end border-opacity-25 border-primary text-start ">
375
+ < tr data-has-plan ="no " class ="section-row bg-purple-100 fw-bold ">
376
+ < td colspan ="1 " class ="section-cell border-bottom border-start border- end border-opacity-25 border-primary text-start ">
382
377
Total score
383
378
</ td >
384
379
< td class ="score border-bottom border-opacity-25 border-primary is--section-score ">
@@ -407,7 +402,7 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
407
402
</ td >
408
403
{% endfor %}
409
404
410
- < td class ="d-none d-md-table-cell top-tier-score border-bottom border-opacity-25 border-primary "> </ td >
405
+ < td class ="d-none d-md-table-cell top-tier-score border-end border- bottom border-opacity-25 border-primary "> </ td >
411
406
< td class ="button-wrapper p-0 bg-white d-none d-md-table-cell "> </ td >
412
407
</ tr >
413
408
</ tbody >
0 commit comments