From 1c5c7250ee28c990a25a1f16cf9a96264e4555df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 14 Jan 2021 15:57:14 +0100
Subject: [PATCH] Unified margin across designs

---
 app/Utils/HtmlEngine.php                  |  2 +-
 resources/views/pdf-designs/bold.html     | 26 +++++++-------------
 resources/views/pdf-designs/business.html |  7 ------
 resources/views/pdf-designs/clean.html    |  3 +++
 resources/views/pdf-designs/creative.html | 29 +++++++----------------
 resources/views/pdf-designs/elegant.html  | 16 ++++++-------
 resources/views/pdf-designs/hipster.html  | 19 +++++++--------
 resources/views/pdf-designs/modern.html   | 12 ++++++----
 resources/views/pdf-designs/plain.html    | 20 +++++++++-------
 resources/views/pdf-designs/playful.html  | 16 ++++++-------
 10 files changed, 65 insertions(+), 85 deletions(-)

diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 7b26ff32f854..ff1020d0b2e8 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -96,7 +96,7 @@ class HtmlEngine
         }
 
         $data = [];
-        $data['$global_margin'] = ['value' => '0cm', 'label' => ''];
+        $data['$global_margin'] = ['value' => '6.35mm', 'label' => ''];
         $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
         $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index 348016d03fe3..bcc650a3a16f 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -1,20 +1,18 @@
 <style id="style">
     :root {
-        --primary-color: $primary_color;
-        --secondary-color: $secondary_color;
-    }
-
-    * {
-        margin: 0;
-        padding: 0;
-        font-size: "$font_size";
+        --primary-color: $ primary_color;
+        --secondary-color: $ secondary_color;
     }
 
     body {
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         font-family: Arial, Helvetica, sans-serif;
-        margin: $global_margin;
+        font-size: "$font_size";
+    }
+
+    @page {
+        margin: -0.25cm !important;
     }
 
     p {
@@ -23,13 +21,6 @@
         page-break-after: always;
     }
 
-    @media print {
-        body {
-            margin-top: 0;
-            margin-right: 0;
-        }
-    }
-
     .header-wrapper {
         display: grid;
         grid-template-columns: 1.5fr 1fr 1fr;
@@ -108,7 +99,7 @@
     #product-table > thead > tr > th,
     #delivery-note-table > thead > tr > th,
     #task-table > thead > tr > th {
-        padding: 2rem;
+        padding: 1.5rem;
         font-size: 1.5rem;
     }
 
@@ -176,6 +167,7 @@
     }
 </style>
 
+
 <div class="header-wrapper" id="header">
     <div></div>
 
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index 9d4206ca81cf..c89bbd3681d3 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -168,13 +168,6 @@
         font-weight: bold !important;
     }
 
-    @media print {
-        body {
-            margin-top: 0;
-            margin-right: 0;
-        }
-    }
-
     #table-totals {
         page-break-inside: avoid;
     }
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 7c7a0524c33e..bbbec1e1e839 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -9,6 +9,9 @@
         -moz-osx-font-smoothing: grayscale;
         font-family: Arial, Helvetica, sans-serif;
         font-size: "$font_size";
+    }
+
+    @page {
         margin: $global_margin;
     }
 
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index a3f3124a5a44..b7b125b36507 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -4,33 +4,20 @@
         --secondary-color: $secondary_color;
     }
 
-    * {
+    body {
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        font-family: Arial, Helvetica, sans-serif;
         font-size: "$font_size";
     }
 
+    @page {
+        margin: $global_margin;
+    }
+
     p {
         margin: 0;
         padding: 0;
-        page-break-after: always;
-    }
-
-    body {
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
-        margin-top: 1cm;
-        margin-bottom: 1cm;
-    }
-
-    @media print {
-        body {
-            margin: 0;
-            padding: 0;
-        }
-    }
-
-    body {
-        margin: $global_margin;
     }
 
     .header-wrapper {
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index a33e8f1e3ffb..3862ae62d574 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -4,22 +4,22 @@
         --secondary-color: $secondary_color;
     }
 
-    * {
+    body {
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        font-family: Arial, Helvetica, sans-serif;
         font-size: "$font_size";
     }
 
+    @page {
+        margin: $global_margin;
+    }
+
     p {
         margin: 0;
         padding: 0;
     }
 
-    body {
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
-        margin: $global_margin;
-    }
-
     .company-logo-wrapper {
         display: flex;
         flex-direction: row;
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index 3942a0eedba8..f56fa8da6522 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -4,25 +4,22 @@
         --secondary-color: $secondary_color;
     }
 
-    * {
+    body {
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        font-family: Arial, Helvetica, sans-serif;
         font-size: "$font_size";
     }
 
+    @page {
+        margin: $global_margin;
+    }
+
     p {
         margin: 0;
         padding: 0;
     }
 
-    body {
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
-    }
-
-    @page {
-        margin: $global_margin;
-    }
-
     .header-wrapper {
         display: grid;
         grid-template-columns: 1.2fr 1.8fr;
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index 8904fe626a8c..b720ff5e6b7e 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -4,18 +4,19 @@
         --secondary-color: $secondary_color;
     }
 
-    * {
-        font-size: "$font_size";
-    }
-
     body {
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         font-family: Arial, Helvetica, sans-serif;
+        font-size: "$font_size";
         margin: 0;
         padding: 0;
     }
 
+    @page {
+        margin: -0.22cm;
+    }
+
     p {
         margin: 0;
         padding: 0;
@@ -82,6 +83,7 @@
     #delivery-note-table > thead,
     #task-table > thead {
         text-align: left;
+        width: 100%;
     }
 
     #product-table > thead > tr > th,
@@ -90,6 +92,7 @@
         padding: 0.8rem;
         background-color: var(--secondary-color);
         color: white;
+        width: 100%;
     }
 
     #product-table > thead > tr > th:last-child,
@@ -188,6 +191,7 @@
 
     table.page-container {
         page-break-after: always;
+        min-width: 100%;
     }
 
     thead.page-header {
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index f9aeca6d44ac..4f5c3b88da85 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -1,21 +1,25 @@
 <style id="style">
-    * {
-        font-size: "$font_size";
-    }
-
-    p {
-        margin: 0;
-        padding: 0;
-        page-break-after: always;
+    :root {
+        --primary-color: $primary_color;
+        --secondary-color: $secondary_color;
     }
 
     body {
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         font-family: Arial, Helvetica, sans-serif;
+        font-size: "$font_size";
+    }
+
+    @page {
         margin: $global_margin;
     }
 
+    p {
+        margin: 0;
+        padding: 0;
+    }
+
     .header-wrapper {
         display: grid;
         grid-template-columns: 1fr 1fr 1fr;
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index f9c1d5e752e9..a069a5e8bd6f 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -4,22 +4,22 @@
         --secondary-color: $secondary_color;
     }
 
-    * {
+    body {
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        font-family: Arial, Helvetica, sans-serif;
         font-size: "$font_size";
     }
 
+    @page {
+        margin: $global_margin;
+    }
+
     p {
         margin: 0;
         padding: 0;
     }
 
-    body {
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        font-family: Arial, Helvetica, sans-serif;
-        margin: $global_margin;
-    }
-
     .header-wrapper {
         display: grid;
         grid-template-columns: 1fr 1fr 1fr;