Skip to content

Commit

Permalink
SDIT-2353: 💄 Sort out strange font sizes (#91)
Browse files Browse the repository at this point in the history
  • Loading branch information
petergphillips authored Jan 7, 2025
1 parent ba2e99f commit 88ade4c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion server/views/pages/search.njk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "../partials/layout.njk" %}
{% from "../macros/filter/categoryFilterMacro.njk" import categoryFilter %}

{% set pageTitle = "HPA Prisoner Search" %}
{% set pageTitle = "Prisoner search" %}
{% set mainClasses = "app-container govuk-body" %}

{% block contentPostErrorSummary %}
Expand Down
10 changes: 4 additions & 6 deletions server/views/partials/detail/addresses.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,19 @@
{% set addressNo = "address" + loop.index0 %}
{% set addressHtml %}
{% if address.person %}
<span class="govuk-body"
data-qa="{{ addressNo }}Person">{{ address.person | title | acronymsToUpperCase }}</span>
<span data-qa="{{ addressNo }}Person">{{ address.person | title | acronymsToUpperCase }}</span>
<br>
{% endif %}
{% if address.street %}
<span class="govuk-body"
data-qa="{{ addressNo }}Street">{{ address.street | title | acronymsToUpperCase }}</span>
<span data-qa="{{ addressNo }}Street">{{ address.street | title | acronymsToUpperCase }}</span>
<br>
{% endif %}
{% if address.town %}
<span class="govuk-body" data-qa="{{ addressNo }}Town">{{ address.town | title }}</span>
<span data-qa="{{ addressNo }}Town">{{ address.town | title }}</span>
<br>
{% endif %}
{% if address.county %}
<span class="govuk-body" data-qa="{{ addressNo }}County">{{ address.county | title }}</span>
<span data-qa="{{ addressNo }}County">{{ address.county | title }}</span>
{% endif %}
{% endset %}
{{ summaryListRow("Address", addressHtml, addressNo + "address", { html: true }) }}
Expand Down
4 changes: 2 additions & 2 deletions server/views/partials/detail/hdc.njk
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<div class="section-divider{{ "-bottom" if loop.last else "" }}">
{% set infoNo = "info" + loop.index0 %}
{% set stageHtml %}
<span class="govuk-body" data-qa="{{ infoNo }}Status">{{ info.status | capitalize | acronymsToUpperCase }}</span>,
<span class="govuk-body" data-qa="{{ infoNo }}Date">{{ info.date | formatDate }}</span>
<span data-qa="{{ infoNo }}Status">{{ info.status | capitalize | acronymsToUpperCase }}</span>,
<span data-qa="{{ infoNo }}Date">{{ info.date | formatDate }}</span>
{% endset %}
{{ summaryListRow(info.stage | capitalize | acronymsToUpperCase, stageHtml, infoNo + "Stage", { html: true }) }}
{{ summaryListRow("Reasons", info.reasons | capitalize | acronymsToUpperCase, infoNo + "Reasons", { hideIfEmpty: "true" }) }}
Expand Down
10 changes: 4 additions & 6 deletions server/views/partials/detail/offencesInCustody.njk
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@
{{ summaryListRow("Prison", offence.establishment | title | acronymsToUpperCase, offenceNo + "Prison", { hideIfEmpty: "true" }) }}
{{ summaryListRow("Outcome", offence.outcome | capitalize, offenceNo + "Outcome", { hideIfEmpty: "true" }) }}
{% set offenceHtml %}
<span class="govuk-body"
data-qa="{{ offenceNo }}Charge">{{ offence.charge | capitalize | acronymsToUpperCase }}</span>
<span data-qa="{{ offenceNo }}Charge">{{ offence.charge | capitalize | acronymsToUpperCase }}</span>
{% if offence.punishments %}
<ul class="govuk-body">
<ul>
{% for punishment in offence.punishments %}
<li>
{% set punishmentNo = offenceNo + "Punishment" + loop.index0 %}
<span class="govuk-body" data-qa="{{ punishmentNo }}Punishment">{{ punishment.punishment | capitalize }}</span>
<span class="govuk-body"
data-qa="{{ punishmentNo }}Duration">({{ punishment.duration }} days)</span>
<span data-qa="{{ punishmentNo }}Punishment">{{ punishment.punishment | capitalize }}</span>
<span data-qa="{{ punishmentNo }}Duration">({{ punishment.duration }} days)</span>
</li>
{% endfor %}
</ul>
Expand Down
5 changes: 2 additions & 3 deletions server/views/partials/detail/sentencing.njk
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
<div class="section-divider{{ "-bottom" if loop.last else "" }}">
{% set sentenceNo = "sentence" + loop.index0 %}
{% set effectiveSentenceHtml %}
<span class="govuk-body"
data-qa="{{ sentenceNo }}ChangeDate">{{ sentence.changeDate | formatDate }}</span>
<span data-qa="{{ sentenceNo }}ChangeDate">{{ sentence.changeDate | formatDate }}</span>
<br>
<span class="govuk-body" data-qa="{{ sentenceNo }}SentenceLength">{{ sentence.lengthDays }} days</span>
<span data-qa="{{ sentenceNo }}SentenceLength">{{ sentence.lengthDays }} days</span>
{% endset %}
{{ summaryListRow("Effective sentence", effectiveSentenceHtml, sentenceNo + "EffectiveSentence", { html: true }) }}
{{ summaryListRow("SED", sentence.SED | formatDate, sentenceNo + "SED", { hideIfEmpty: "true" }) }}
Expand Down

0 comments on commit 88ade4c

Please sign in to comment.