Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#2605] Use NLDS classes for uitkeringen PDF styling #1298

Merged
merged 2 commits into from
Jul 11, 2024
Merged

[#2605] Use NLDS classes for uitkeringen PDF styling #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a02560
[#2605] Use NLDS classes for uitkeringen PDF styling
pi-sigma Jul 8, 2024
2e08903
[#2605] reverted NLDS classes to uitkeringen-PDF styles
jiromaykin Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/open_inwoner/scss/pdf/_jaaropgave.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.yearly-report {
box-sizing: border-box;
font-family: sans-serif;

.header {
min-height: 50px;
Expand All @@ -15,6 +16,7 @@

.yearly-report__p,
.yearly-report__td {
font-family: sans-serif;
font-size: 13px;
}

Expand All @@ -23,11 +25,13 @@
}

.yearly-report__p.inhoudingsplichtige {
font-family: sans-serif;
font-weight: bold;
}

.utrecht-heading-1,
.utrecht-heading-2 {
.uitkeringen-heading-1,
.uitkeringen-heading-2 {
font-family: sans-serif;
font-size: 20px;
font-weight: normal;
margin: 0;
Expand Down Expand Up @@ -72,6 +76,7 @@
}

.yearly-report__th {
font-family: uitkeringen-heading-2;
padding: 0.3em;
font-weight: normal;
vertical-align: bottom;
Expand Down Expand Up @@ -131,7 +136,7 @@
margin-top: 0.2em;
text-transform: uppercase;

.utrecht-heading-2 {
.uitkeringen-heading-2 {
font-size: 12px;
font-weight: bold;
}
Expand All @@ -141,11 +146,12 @@
line-height: 1.6;
font-size: 11px;

.utrecht-heading-1,
.utrecht-heading-2 {
.uitkeringen-heading-1,
.uitkeringen-heading-2 {
font-family: sans-serif;
font-size: 12px;
}
.utrecht-heading-1 {
.uitkeringen-heading-1 {
text-transform: uppercase;
}
}
Expand Down
7 changes: 6 additions & 1 deletion src/open_inwoner/scss/pdf/_maandspecificatie.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@

.monthly-report {
box-sizing: border-box;
font-family: sans-serif;

.header {
min-height: 50px;
}

.monthly-report__p {
font-family: sans-serif;
font-size: 11px;
}

Expand All @@ -21,7 +23,8 @@
display: flex;
justify-content: space-between;

.utrecht-heading-1 {
.uitkeringen-heading-1 {
font-family: sans-serif;
font-size: 20px;
font-weight: normal;
margin: 0;
Expand Down Expand Up @@ -61,6 +64,7 @@
}

.monthly-report__td {
font-family: sans-serif;
font-size: 10px;
padding: 0.3em;
}
Expand Down Expand Up @@ -93,6 +97,7 @@
}

.section-title {
font-family: sans-serif;
font-size: 10px;
font-weight: bold;
padding: 15px 0 5px 0;
Expand Down
2 changes: 1 addition & 1 deletion src/open_inwoner/ssd/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def get_reports(
report_data.update(
{
"logo": self.config.logo,
"jaaropgave_comments": self.config.jaaropgave_pdf_comments,
"pdf_comments": self.config.jaaropgave_pdf_comments,
}
)
pdf = render_pdf(
Expand Down
6 changes: 3 additions & 3 deletions src/open_inwoner/ssd/templates/jaaropgave.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="yearly-report">
<header class="header flex-container extra-margin-top">
<div class="flex-box heading">
<h1 class="utrecht-heading-1">Jaaropgave {{ spec.dienstjaar|unlocalize }}</h1>
<h1 class="uitkeringen-heading-1">Jaaropgave {{ spec.dienstjaar|unlocalize }}</h1>
</div>
<div class="flex-box heading__logo right">
<img class="yearly-report__logo" src="{{ report.logo.url }}" alt="">
Expand All @@ -38,7 +38,7 @@ <h1 class="utrecht-heading-1">Jaaropgave {{ spec.dienstjaar|unlocalize }}</h1>
<!-- PARTICIPATIEWET -->
<section class="section section__participatiewet">
<div class="heading">
<h2 class="utrecht-heading-2">Participatiewet</h2>
<h2 class="uitkeringen-heading-2">Participatiewet</h2>
</div>
<!-- row 1 -->
<div class="subsection">
Expand Down Expand Up @@ -105,7 +105,7 @@ <h2 class="utrecht-heading-2">Participatiewet</h2>
<!-- TOELICHTING -->
<section class="section section__toelichting extra-margin">
<div class="subsection extra-margin">
<p class="yearly-report__p yearly-report__comments" >{{ report.jaaropgave_pdf_comments|markdown|safe }}</p>
<div class="yearly-report__p yearly-report__comments" >{{ report.pdf_comments|markdown|safe }}</div>
</div>
</section>
</div>
Expand Down
14 changes: 7 additions & 7 deletions src/open_inwoner/ssd/templates/maandspecificatie.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
<!-- HEADER -->
<header class="header flex-container">
<div class="flex-box heading left">
<h1 class="utrecht-heading-1">Maandspecificatie {% format_date_month_name dossier.periodenummer %}</h1>
<h1 class="uitkeringen-heading-1">Maandspecificatie {% format_date_month_name dossier.periodenummer %}</h1>
</div>
<div class="flex-box heading__logo right">
<img class="monthly-report__logo" src="{{ report.logo.url }}" alt="">
</div>
</header>
<!-- Uitkeringsinstantie -->
<h2 class="utrecht-heading-2 section-title">Uitkeringsinstantie</h2>
<h2 class="uitkeringen-heading-2 section-title">Uitkeringsinstantie</h2>
<section class="section section__uitkeringsinstantie">
<table class="monthly-report__table">
<tr class="monthly-report__tr">
Expand All @@ -41,7 +41,7 @@ <h2 class="utrecht-heading-2 section-title">Uitkeringsinstantie</h2>
</table>
</section>
<!-- Client -->
<h2 class="utrecht-heading-2 section-title">Client</h2>
<h2 class="uitkeringen-heading-2 section-title">Client</h2>
<section class="section section__client">
<table class="monthly-report__table">
<tr class="monthly-report__tr">
Expand All @@ -67,7 +67,7 @@ <h2 class="utrecht-heading-2 section-title">Client</h2>
</table>
</section>
<!-- Uitkeringsspecificatie -->
<h2 class="utrecht-heading-2 section-title">Uitkeringsspecificatie</h2>
<h2 class="uitkeringen-heading-2 section-title">Uitkeringsspecificatie</h2>
<section class="section section__uitkeringsspecificatie">
<table class="monthly-report__table">
<tr class="monthly-report__tr">
Expand All @@ -85,7 +85,7 @@ <h2 class="utrecht-heading-2 section-title">Uitkeringsspecificatie</h2>
</table>
</section>
<!-- Details -->
<h2 class="utrecht-heading-2 section-title">Details</h2>
<h2 class="uitkeringen-heading-2 section-title">Details</h2>
<section class="section section__benefitdetails">
<table class="monthly-report__table" id="monthly-report__table-details">
<tr class="monthly-report__tr">
Expand All @@ -105,7 +105,7 @@ <h2 class="utrecht-heading-2 section-title">Details</h2>
</table>
</section>
<!-- Inkomstenkorting -->
<h2 class="utrecht-heading-2 section-title">Inkomstenkorting</h2>
<h2 class="uitkeringen-heading-2 section-title">Inkomstenkorting</h2>
<section class="section section__inkomstenkorting">
<table class="monthly-report__table" id="monthly-report__table-inkomstenkorting">
<tr class="monthly-report__tr">
Expand Down Expand Up @@ -160,7 +160,7 @@ <h2 class="utrecht-heading-2 section-title">Inkomstenkorting</h2>

{# Optional comments/help text #}
{% if comments %}
<section class="section">
<section class="section monthly-report__p">
{{ comments|markdown|safe }}
</section>
{% endif %}
Expand Down
Loading