From b40d2bc50b163ed3789d454977c41ca5046b5f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 1 Oct 2020 13:37:34 +0200
Subject: [PATCH 1/2] Replace $font-size with $font_size

---
 app/Utils/HtmlEngine.php                  | 2 +-
 resources/views/pdf-designs/bold.html     | 2 +-
 resources/views/pdf-designs/business.html | 2 +-
 resources/views/pdf-designs/clean.html    | 2 +-
 resources/views/pdf-designs/creative.html | 2 +-
 resources/views/pdf-designs/elegant.html  | 2 +-
 resources/views/pdf-designs/hipster.html  | 2 +-
 resources/views/pdf-designs/modern.html   | 2 +-
 resources/views/pdf-designs/plain.html    | 2 +-
 resources/views/pdf-designs/playful.html  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index abe051a35c59..78e919389119 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -317,7 +317,7 @@ class HtmlEngine
         $data['_rate2'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['_rate3'] = ['value' => '', 'label' => ctrans('texts.tax')];
 
-        $data['$font-size'] = ['value' => $this->settings->font_size . 'px', 'label' => ''];
+        $data['$font_size'] = ['value' => $this->settings->font_size . 'px', 'label' => ''];
 
         $data['$invoiceninja.whitelabel'] = ['value' => asset('images/created-by-invoiceninja-new.png'), 'label' => ''];
 
diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index 8560d000c2a5..fa0b1a4c238d 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -8,7 +8,7 @@
             * {
                 margin: 0;
                 padding: 0;
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             body {
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index b75e2d489d46..dce27f8c5ea8 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -9,7 +9,7 @@
                 -webkit-font-smoothing: antialiased;
                 -moz-osx-font-smoothing: grayscale;
                 font-family: Arial, Helvetica, sans-serif;
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             @page {
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 0d84d8e69dc8..c3919f4220f3 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -10,7 +10,7 @@
                 -webkit-font-smoothing: antialiased;
                 -moz-osx-font-smoothing: grayscale;
                 font-family: Arial, Helvetica, sans-serif;
-                font-size: '$font-size';
+                font-size: '$font_size';
                 margin: 1cm;
             }
 
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index 12afeced77fb..15f2f573dead 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -6,7 +6,7 @@
 
         <style id="style">
             * {
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             p {
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index 613df3046dac..332ad23d38c6 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -6,7 +6,7 @@
 
         <style id="style">
             * {
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             p {
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index d549f89f9663..5c5d5b49a6ba 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -6,7 +6,7 @@
 
         <style id="style">
             * {
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             p {
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index c4d06d678fc7..741d3acf4d03 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -6,7 +6,7 @@
 
         <style id="style">
             * {
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             body {
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index 485b1225f6f5..be64b713d05b 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -6,7 +6,7 @@
 
         <style id="style">
             * {
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             p {
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 89d602512390..4fce2118288f 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -6,7 +6,7 @@
 
         <style id="style">
             * {
-                font-size: '$font-size';
+                font-size: '$font_size';
             }
 
             p {

From 6796f7876d11a6413445f78dc5c8650007774e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 1 Oct 2020 13:40:09 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Remove=20comments=20from=20designs=C4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/pdf-designs/bold.html     | 4 ++--
 resources/views/pdf-designs/business.html | 2 +-
 resources/views/pdf-designs/clean.html    | 5 +----
 resources/views/pdf-designs/creative.html | 2 +-
 resources/views/pdf-designs/hipster.html  | 2 +-
 resources/views/pdf-designs/modern.html   | 6 ++----
 resources/views/pdf-designs/plain.html    | 2 +-
 resources/views/pdf-designs/playful.html  | 6 ++----
 8 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index fa0b1a4c238d..0437cc016378 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -143,7 +143,7 @@
     </head>
 
     <div class="header-wrapper" id="header">
-        <div><!-- Empty space placeholder--></div>
+        <div></div>
 
         <div id="company-details"></div>
         <div id="company-address"></div>
@@ -169,5 +169,5 @@
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index dce27f8c5ea8..a5e5f89aec78 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -201,5 +201,5 @@
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index c3919f4220f3..410556740a5e 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -1,4 +1,3 @@
-<!-- Template: Clean -->
 <!DOCTYPE html>
 <html lang="en">
     <head id="head">
@@ -155,11 +154,9 @@
             <div id="client-details"></div>
         </div>
 
-        <!-- product_table -->
         <table id="product-table" cellspacing="0"></table>
-
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index 15f2f573dead..074562bc18be 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -165,5 +165,5 @@
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index 5c5d5b49a6ba..934e4c423120 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -204,5 +204,5 @@
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index 741d3acf4d03..1d9a0e48d387 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -187,12 +187,10 @@
             <tr>
                 <td class="page-footer-cell">
                     <div class="footer-info">
-                        <div style="margin-top: 195px">
-                            <!-- An offset div to space out table from footer -->
-                        </div>
+                        <div style="margin-top: 195px"></div>
                         <div class="footer-wrapper" id="footer">
                             <div class="footer-content">
-                                <div><!-- Placeholder for offset --></div>
+                                <div></div>
                                 <div id="company-details"></div>
                                 <div id="company-address"></div>
                             </div>
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index be64b713d05b..446449f51bae 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -135,5 +135,5 @@
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 4fce2118288f..959e43c27730 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -158,9 +158,7 @@
                 alt="$company.name logo"
             />
 
-            <div>
-                <!-- Placeholder for empty space -->
-            </div>
+            <div></div>
 
             <div class="entity-details-wrapper">
                 <table id="entity-details" cellspacing="0"></table>
@@ -187,5 +185,5 @@
         <div id="product-table-footer" cellspacing="0"></div>
     </body>
 
-    <div id="footer"><!-- Your footer content here --></div>
+    <div id="footer"></div>
 </html>