Merge pull request #41 from sprain/adjust-html-output

Improve HtmlOutput css styles
sprain · Apr 25, 2020 · 54a1b9f · 54a1b9f
2 parents 302af43 + 72bd491
commit 54a1b9f
Show file tree

Hide file tree

Showing 18 changed files with 104 additions and 17 deletions.
diff --git 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/src/PaymentPart/Output/HtmlOutput/Template/PrintableStylesTemplate.php b/src/PaymentPart/Output/HtmlOutput/Template/PrintableStylesTemplate.php
@@ -6,6 +6,10 @@ class PrintableStylesTemplate
 {
     public const TEMPLATE = <<<EOT
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }
 

diff --git 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
@@ -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;
 }
@@ -159,6 +162,10 @@
 }
 
 #qr-bill-separate-info {
+    border-bottom: 0;
+}
+
+#qr-bill-separate-info-text {
     display: none;
 }