From 72bd491b175751d939e144df184b6fa87e1248fb Mon Sep 17 00:00:00 2001 From: Manuel Reinhard Date: Sat, 25 Apr 2020 15:57:00 +0200 Subject: [PATCH] Improve css in HtmlOutput to define font for all child elements This may be relevant if other css on the same page is present which may have a higher specificity otherwise. --- .../Output/HtmlOutput/Template/PaymentPartTemplate.php | 5 ++++- tests/TestData/HtmlOutput/qr-additional-information.html | 5 ++++- .../TestData/HtmlOutput/qr-additional-information.print.html | 5 ++++- tests/TestData/HtmlOutput/qr-alternative-schemes.html | 5 ++++- tests/TestData/HtmlOutput/qr-alternative-schemes.print.html | 5 ++++- tests/TestData/HtmlOutput/qr-full-set.html | 5 ++++- tests/TestData/HtmlOutput/qr-full-set.print.html | 5 ++++- tests/TestData/HtmlOutput/qr-minimal-setup.html | 5 ++++- tests/TestData/HtmlOutput/qr-minimal-setup.print.html | 5 ++++- .../HtmlOutput/qr-payment-information-without-amount.html | 5 ++++- .../qr-payment-information-without-amount.print.html | 5 ++++- tests/TestData/HtmlOutput/qr-payment-reference-non.html | 5 ++++- .../TestData/HtmlOutput/qr-payment-reference-non.print.html | 5 ++++- tests/TestData/HtmlOutput/qr-payment-reference-scor.html | 5 ++++- .../TestData/HtmlOutput/qr-payment-reference-scor.print.html | 5 ++++- tests/TestData/HtmlOutput/qr-ultimate-debtor.html | 5 ++++- tests/TestData/HtmlOutput/qr-ultimate-debtor.print.html | 5 ++++- 17 files changed, 68 insertions(+), 17 deletions(-) diff --git a/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php b/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php index 7a4fbb17..e8ce724e 100644 --- a/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php +++ b/src/PaymentPart/Output/HtmlOutput/Template/PaymentPartTemplate.php @@ -10,11 +10,14 @@ class PaymentPartTemplate box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-additional-information.html b/tests/TestData/HtmlOutput/qr-additional-information.html index 60092e58..0ab7121c 100644 --- a/tests/TestData/HtmlOutput/qr-additional-information.html +++ b/tests/TestData/HtmlOutput/qr-additional-information.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-additional-information.print.html b/tests/TestData/HtmlOutput/qr-additional-information.print.html index 678be7d6..03dadfcb 100644 --- a/tests/TestData/HtmlOutput/qr-additional-information.print.html +++ b/tests/TestData/HtmlOutput/qr-additional-information.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.html index 993f0eba..23178716 100644 --- a/tests/TestData/HtmlOutput/qr-alternative-schemes.html +++ b/tests/TestData/HtmlOutput/qr-alternative-schemes.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.print.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.print.html index 338643c5..6b8558c1 100644 --- a/tests/TestData/HtmlOutput/qr-alternative-schemes.print.html +++ b/tests/TestData/HtmlOutput/qr-alternative-schemes.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-full-set.html b/tests/TestData/HtmlOutput/qr-full-set.html index 3400437b..297382a3 100644 --- a/tests/TestData/HtmlOutput/qr-full-set.html +++ b/tests/TestData/HtmlOutput/qr-full-set.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-full-set.print.html b/tests/TestData/HtmlOutput/qr-full-set.print.html index 41a4a80c..ceb023d5 100644 --- a/tests/TestData/HtmlOutput/qr-full-set.print.html +++ b/tests/TestData/HtmlOutput/qr-full-set.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-minimal-setup.html b/tests/TestData/HtmlOutput/qr-minimal-setup.html index d0acb7ee..c6915156 100644 --- a/tests/TestData/HtmlOutput/qr-minimal-setup.html +++ b/tests/TestData/HtmlOutput/qr-minimal-setup.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-minimal-setup.print.html b/tests/TestData/HtmlOutput/qr-minimal-setup.print.html index 8fe63d47..52083d27 100644 --- a/tests/TestData/HtmlOutput/qr-minimal-setup.print.html +++ b/tests/TestData/HtmlOutput/qr-minimal-setup.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.html b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.html index 27783367..62549015 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.print.html b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.print.html index 2d94983c..b4e3f795 100644 --- a/tests/TestData/HtmlOutput/qr-payment-information-without-amount.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-information-without-amount.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-non.html b/tests/TestData/HtmlOutput/qr-payment-reference-non.html index ba0eeafe..85981bb5 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-non.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-non.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-non.print.html b/tests/TestData/HtmlOutput/qr-payment-reference-non.print.html index 14cd56e3..93398e37 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-non.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-non.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-scor.html b/tests/TestData/HtmlOutput/qr-payment-reference-scor.html index e6c7bd23..1a9ad804 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-scor.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-scor.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-payment-reference-scor.print.html b/tests/TestData/HtmlOutput/qr-payment-reference-scor.print.html index f4b8f1c1..32b5cd64 100644 --- a/tests/TestData/HtmlOutput/qr-payment-reference-scor.print.html +++ b/tests/TestData/HtmlOutput/qr-payment-reference-scor.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-ultimate-debtor.html b/tests/TestData/HtmlOutput/qr-ultimate-debtor.html index 63ee966c..7d63f98c 100644 --- a/tests/TestData/HtmlOutput/qr-ultimate-debtor.html +++ b/tests/TestData/HtmlOutput/qr-ultimate-debtor.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; } diff --git a/tests/TestData/HtmlOutput/qr-ultimate-debtor.print.html b/tests/TestData/HtmlOutput/qr-ultimate-debtor.print.html index b3794d60..5f8cdcd1 100644 --- a/tests/TestData/HtmlOutput/qr-ultimate-debtor.print.html +++ b/tests/TestData/HtmlOutput/qr-ultimate-debtor.print.html @@ -3,11 +3,14 @@ box-sizing: border-box; width: 210mm; height: 105mm; - font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; border-collapse: collapse; color: #000; } +#qr-bill * { + font-family: Arial, Frutiger, Helvetica, "Liberation Sans"; +} + #qr-bill img.qr-bill-placeholder { margin-top: 1pt; }