Skip to content

Commit

Permalink
Merge pull request #2971 from navikt/quill-vennlig-tabeller
Browse files Browse the repository at this point in the history
Skal gjøre tabellene _quill-vennlige_ - bytter ut th med td, selv om …
  • Loading branch information
charliemidtlyng authored Jan 6, 2025
2 parents b26a01a + d5672ca commit f81428f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
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
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

0 comments on commit f81428f

Please sign in to comment.