From 45cb41a65a3841ad5507586cfe2b9f2c76cd9e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 17 Aug 2021 18:21:51 +0200 Subject: [PATCH 01/15] Clean: Bottom align the logo with company details --- resources/views/pdf-designs/clean.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index 1859255dad54..dd0d2ba26738 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -201,6 +201,12 @@ font-size: 1rem; margin-bottom: 0; } + + .company-logo-container { + display: flex; + flex-direction: column; + justify-content: flex-end; + } /** Useful snippets, uncomment to enable. **/ From 84febb3a2a1691cb91231d835d1d40f7e356eee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 17 Aug 2021 18:46:22 +0200 Subject: [PATCH 02/15] Clean: Update line height, company logo position --- resources/views/pdf-designs/clean.html | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index dd0d2ba26738..1d21d47f24ce 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -2,6 +2,7 @@ :root { --primary-color: $primary_color; --secondary-color: $secondary_color; + --line-height: 1.6; } body { @@ -35,6 +36,7 @@ #company-details { display: flex; flex-direction: column; + line-height: var(--line-height); } #company-details > p:first-child { @@ -44,10 +46,11 @@ #company-address { display: flex; flex-direction: column; + line-height: var(--line-height); } .entity-label { - margin-top: 1rem; + margin-top: 2.5rem; text-transform: uppercase; padding-left: 1rem; margin-bottom: 1rem; @@ -56,8 +59,7 @@ } .client-and-entity-wrapper { - display: grid; - grid-template-columns: .75fr 1fr; + display: flex; padding: 1rem; border-top: 1px solid #d8d8d8; border-bottom: 1px solid #d8d8d8; @@ -65,16 +67,21 @@ #entity-details { text-align: left; + margin-right: 20px; } #entity-details > tr, #entity-details th { font-weight: normal; + padding-right: 15px; + padding-top: 2.5px; + padding-bottom: 2.5px; } #client-details { display: flex; flex-direction: column; + line-height: var(--line-height); } #client-details > :first-child { @@ -242,11 +249,9 @@
- +
+ +
@@ -254,7 +259,9 @@

$entity_label

-
+
+
+
From 0a910b7fba43fb0946108df58b422481f17872a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 17 Aug 2021 18:51:20 +0200 Subject: [PATCH 03/15] Plain: Update line height --- resources/views/pdf-designs/plain.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index f6ff091b7d51..1d64f1ee3941 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -2,6 +2,7 @@ :root { --primary-color: $primary_color; --secondary-color: $secondary_color; + --line-height: 1.6; } body { @@ -25,6 +26,7 @@ .header-wrapper { display: grid; grid-template-columns: 1fr 1fr 1fr; + line-height: var(--line-height); } .company-logo { @@ -34,6 +36,7 @@ .header-wrapper #company-address { display: flex; flex-direction: column; + line-height: var(--line-height); } .header-wrapper #entity-details { @@ -62,6 +65,7 @@ #client-details { display: flex; flex-direction: column; + line-height: var(--line-height); } #product-table, @@ -209,6 +213,7 @@ /** For more info, please check our docs: https://invoiceninja.github.io **/ /** To find out selectors on your own: https://invoiceninja.github.io/docs/custom-fields/#snippets **/ +
From d0a2af4b177101db1bed3f217cc8147548a1621b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 17 Aug 2021 18:58:17 +0200 Subject: [PATCH 04/15] Plain: Hightlight outstanding section --- resources/views/pdf-designs/plain.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 1d64f1ee3941..aad262998cb4 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -138,6 +138,7 @@ #table-totals>.totals-table-right-side>*> :nth-child(1) { text-align: "$dir_text_align"; margin-top: .75rem; + padding-left: 7px; } #table-totals>.totals-table-right-side> * > :not([hidden]) ~ :not([hidden]) { @@ -148,6 +149,7 @@ #table-totals>.totals-table-right-side>*> :nth-child(2) { text-align: right; + padding-right: 7px; } #table-totals @@ -184,6 +186,15 @@ margin-bottom: 0; } + [data-ref="totals_table-outstanding-label"], + [data-ref="totals_table-outstanding"] { + background-color: #e6e6e6; + color: black; + padding-top: 7px; + padding-bottom: 7px; + padding-right: 7px; + } + /** Useful snippets, uncomment to enable. **/ /** Hide company logo **/ From 938bcbf9e92113251392b10efd04a59567e7dcc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 18 Aug 2021 11:03:37 +0200 Subject: [PATCH 05/15] Bold: Line height, company logo, width on description --- resources/views/pdf-designs/bold.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index a491a9323046..dad6d9c26127 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -2,6 +2,7 @@ :root { --primary-color: $primary_color; --secondary-color: $secondary_color; + --line-height: 1.6; } body { @@ -31,10 +32,12 @@ padding: 3rem; color: white; min-width: 100%; + line-height: var(--line-height); } .company-logo { max-width: 65%; + max-width: 50%; } #company-details, @@ -47,6 +50,7 @@ margin: 2rem; display: flex; flex-direction: column; + line-height: var(--line-height); } #client-details > :first-child { @@ -251,6 +255,10 @@ margin-bottom: 0; } + [data-ref="product_table-product.description-th"] { + width: 23%; + } + /** Useful snippets, uncomment to enable. **/ /** Hide company logo **/ From 92071c7aba9a8557b997cbc515f37f806b1becef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 18 Aug 2021 11:10:16 +0200 Subject: [PATCH 06/15] Bold: Fix max width --- resources/views/pdf-designs/bold.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index dad6d9c26127..46a89373ee33 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -36,8 +36,7 @@ } .company-logo { - max-width: 65%; - max-width: 50%; + max-width: 55%; } #company-details, From 919dbd35a88d03c7279b83370698593b21f68e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 18 Aug 2021 11:25:16 +0200 Subject: [PATCH 07/15] Modern: Logo spacing, line spacing, footer spacing --- resources/views/pdf-designs/modern.html | 326 ++++++++++++------------ 1 file changed, 170 insertions(+), 156 deletions(-) diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index c8f00b4f2f07..d8cfa66695a0 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -1,31 +1,31 @@ @@ -367,8 +379,10 @@ }); -
-
+ From 7d78f4b8bd7d1ebc3c7113fc64f445f007173a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 18 Aug 2021 11:31:28 +0200 Subject: [PATCH 08/15] Business: Update line height, outstanding section --- resources/views/pdf-designs/business.html | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index fe23173e83f1..3864c54c31c1 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -2,6 +2,7 @@ :root { --primary-color: $primary_color; --secondary-color: $secondary_color; + --line-height: 1.6; } body { @@ -40,16 +41,14 @@ display: flex; flex-direction: column; color: #AAA9A9; + line-height: var(--line-height); } #company-address { display: flex; flex-direction: column; color: #b1b1b1; - } - - #company-address > * { - margin-bottom: 0.8rem; + line-height: var(--line-height); } .entity-issued-to { @@ -67,6 +66,7 @@ display: flex; flex-direction: column; margin-top: 1rem; + line-height: var(--line-height); } #client-details > p:nth-child(1) { @@ -195,6 +195,7 @@ #table-totals>.totals-table-right-side>*> :nth-child(1) { text-align: "$dir_text_align"; margin-top: .75rem; + padding-left: 7px; } #table-totals>.totals-table-right-side> * > :not([hidden]) ~ :not([hidden]) { @@ -205,6 +206,7 @@ #table-totals>.totals-table-right-side>*> :nth-child(2) { text-align: right; + padding-right: 7px; } #table-totals @@ -244,6 +246,15 @@ margin-bottom: 0; } + [data-ref="totals_table-outstanding-label"], + [data-ref="totals_table-outstanding"] { + background-color: var(--secondary-color); + color: white; + padding-top: 7px; + padding-bottom: 7px; + padding-right: 7px; + } + /** Useful snippets, uncomment to enable. **/ /** Hide company logo **/ From d5bcecc33f669f1a37328d7159390d90b3ed8f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 18 Aug 2021 11:35:41 +0200 Subject: [PATCH 09/15] Business: Update box size --- resources/views/pdf-designs/business.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index 3864c54c31c1..98443c197eb3 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -57,8 +57,8 @@ } .client-and-entity-wrapper { - display: grid; - grid-template-columns: 2fr 1.5fr; + display: flex; + justify-content: space-between; gap: 20px; } @@ -82,6 +82,8 @@ text-align: left; } + #entity-details p { margin-right: 20px; } + #entity-details th { font-weight: normal; padding-bottom: .5rem; From 31065b10eea97283427ab52421e2bc87ea0c910b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 18 Aug 2021 11:53:41 +0200 Subject: [PATCH 10/15] Playful: Line height, header spacing, bottom colors --- resources/views/pdf-designs/playful.html | 42 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index 31bbbfe608a9..76ae0da483d5 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -2,6 +2,7 @@ :root { --primary-color: $primary_color; --secondary-color: $secondary_color; + --line-height: 1.6; } body { @@ -24,8 +25,9 @@ .header-wrapper { margin-top: 2rem; - display: grid; - grid-template-columns: 1fr 0.5fr 2fr; + display: flex; + justify-content: space-between; + gap: 20px; padding: 2rem 3rem; } @@ -35,6 +37,8 @@ border-radius: 10px; } + #entity-details p { margin-right: 20px; } + .header-wrapper #entity-details { width: 100%; color: white; @@ -249,6 +253,19 @@ margin-bottom: 0; } + #footer-colors { + position: fixed; + bottom: 0; + min-width: 100%; + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + margin-left: -10px; + } + + #footer-colors > * { + padding: 10px; + } + /** Useful snippets, uncomment to enable. **/ /** Hide company logo **/ @@ -292,13 +309,9 @@
- - -
+
+ +
@@ -332,6 +345,17 @@