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

Skal gjøre tabellene _quill-vennlige_ - bytter ut th med td, selv om … #2971

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Skal gjøre tabellene _quill-vennlige_ - bytter ut th med td, selv om … #2971

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
7f6a352
Skal gjøre tabellene _quill-vennlige_ - bytter ut th med td, selv om …
charliemidtlyng Dec 19, 2024
d5672ca
Fjern klasse som ble brukt til å teste quill sin delta-oppbygging
charliemidtlyng Dec 19, 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
16 changes: 8 additions & 8 deletions src/frontend/Komponenter/Behandling/Brev/UtregningstabellBarnetilsyn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ const lagInntektsperioder = (beløpsperioder: IBeregningsperiodeBarnetilsyn[]):
return `<table style="margin-left: 2px; margin-right: 2px; border-collapse: collapse; ${borderStylingCompact}">
<thead>
<tr>
<th style="width: 100px; ${borderStylingCompact}">Periode</th>
<th style="width: 40px; ${borderStylingCompact}">Ant. barn</th>
<th style="width: 45px; word-wrap: break-word; ${borderStylingCompact}">Utgifter</th>
<td style="width: 100px; ${borderStylingCompact}"><strong>Periode</strong></td>
<td style="width: 40px; ${borderStylingCompact}"><strong>Ant. barn</strong></td>
<td style="width: 45px; word-wrap: break-word; ${borderStylingCompact}"><strong>Utgifter</strong></td>
${
harKontantStøtte
? `<th style="width: 60px; word-wrap: break-word; ${borderStylingCompact}">
Kontantstøtte
</th>`
? `<td style="width: 60px; word-wrap: break-word; ${borderStylingCompact}">
<strong>Kontantstøtte</strong>
</td>`
: ''
}
${
harTilleggsstønad
? `<th style="width: 60px; word-wrap: break-word; ${borderStylingCompact}">Tilleggsstønad</th>`
? `<td style="width: 60px; word-wrap: break-word; ${borderStylingCompact}"><strong>Tilleggsstønad</strong></td>`
: ''
}
<th style="width: 65px; word-wrap: break-word; ${borderStylingCompact}">Dette får du utbetalt pr. måned</th>
<td style="width: 65px; word-wrap: break-word; ${borderStylingCompact}"><strong>Dette får du utbetalt pr. måned</strong></td>
</tr>
</thead>
<tbody>
Expand Down
8 changes: 4 additions & 4 deletions src/frontend/Komponenter/Behandling/Brev/UtregningstabellOvergangsstønad.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ const lagInntektsperioder = (beløpsperioder?: IBeløpsperiode[]): string => {
return `<table style="margin-left: 2px; margin-right: 2px; border-collapse: collapse; ${borderStylingCompact}">
<thead>
<tr>
<th style="width: 110px; ${borderStylingCompact}">Periode</th>
<th style="width: 55px; word-wrap: break-word; ${borderStylingCompact}">Beregnet inntekt</th>
<td style="width: 110px; ${borderStylingCompact}"><strong>Periode</strong></td>
<td style="width: 55px; word-wrap: break-word; ${borderStylingCompact}"><strong>Beregnet inntekt</strong></td>
${
samordningskolonneTittel &&
`<th style="width: 90px; word-wrap: break-word; ${borderStylingCompact}">${samordningskolonneTittel}</th>`
`<td style="width: 90px; word-wrap: break-word; ${borderStylingCompact}"><strong>${samordningskolonneTittel}</strong></td>`
}
<th style="width: 55px; word-wrap: break-word; ${borderStylingCompact}">Dette får du utbetalt pr. måned</th>
<td style="width: 55px; word-wrap: break-word; ${borderStylingCompact}"><strong>Dette får du utbetalt pr. måned</strong></td>
</tr>
</thead>
<tbody>
Expand Down
Loading