Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 05:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4060 from beganovich/v2-design-fixes

Browse Source 
Design fixes & updates
This commit is contained in:
David Bomba 2020-09-12 09:12:03 +10:00 committed by GitHub
commit 9463ad07c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/PdfMaker/Design.php
View File

@ -234,9 +234,9 @@ class Design extends BaseDesign
$variable = sprintf('%s%s', '$', $property); $variable = sprintf('%s%s', '$', $property);
if ( if (
!is_null($this->entity->{$property}) || !is_null($this->entity->{$property}) &&
!empty($this->entity->{$property}) || !empty($this->entity->{$property}) &&
$this->entity->{$property} !== 0 $this->entity->{$property} != 0
) { ) {
continue; continue;
} }

6
resources/views/pdf-designs/bold.html
View File

@ -110,10 +110,14 @@
background-color: #ebebeb; background-color: #ebebeb;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
padding-top: 1.2rem; padding-top: .5rem;
padding-left: 1.2rem; padding-left: 1.2rem;
gap: 20px; gap: 20px;
} }

7
resources/views/pdf-designs/business.html
View File

@ -20,7 +20,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.header-container { .header-container {
display: grid; display: grid;
grid-template-columns: 1.8fr 1fr 1fr; grid-template-columns: 1.8fr 1fr 1fr;
@ -134,6 +134,11 @@
margin-right: 0; margin-right: 0;
} }
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > *:last-child { #product-table-footer > *:last-child {
border-bottom-left-radius: 1rem; border-bottom-left-radius: 1rem;
border-bottom-right-radius: 1rem; border-bottom-right-radius: 1rem;

6
resources/views/pdf-designs/clean.html
View File

@ -106,10 +106,14 @@
background-color: #f5f5f5; background-color: #f5f5f5;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
padding-top: 1rem; padding-top: .5rem;
padding-left: 1rem; padding-left: 1rem;
gap: 20px; gap: 20px;
} }

4
resources/views/pdf-designs/creative.html
View File

@ -107,6 +107,10 @@
background-color: #e8e8e8; background-color: #e8e8e8;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;

7
resources/views/pdf-designs/elegant.html
View File

@ -16,7 +16,6 @@
p { p {
margin: 0; margin: 0;
padding: 0; padding: 0;
page-break-after: always;
} }
body { body {
@ -112,11 +111,15 @@
padding-bottom: 1rem; padding-bottom: 1rem;
border-bottom: 4px solid; border-bottom: 4px solid;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
padding-top: 1rem; padding-top: .5rem;
padding-left: 1rem; padding-left: 1rem;
gap: 20px; gap: 20px;
} }

6
resources/views/pdf-designs/hipster.html
View File

@ -117,10 +117,14 @@
text-align: right; text-align: right;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
padding-top: 1.5rem; padding-top: .5rem;
padding-left: 1rem; padding-left: 1rem;
gap: 20px; gap: 20px;
} }

6
resources/views/pdf-designs/modern.html
View File

@ -115,10 +115,14 @@
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
margin-top: 1.5rem; margin-top: .5rem;
margin-right: 1.5rem; margin-right: 1.5rem;
margin-left: 1.5rem; margin-left: 1.5rem;
} }

6
resources/views/pdf-designs/plain.html
View File

@ -85,11 +85,15 @@
#product-table > tbody > tr > td:last-child { #product-table > tbody > tr > td:last-child {
text-align: right; text-align: right;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
padding-top: 1rem; padding-top: .5rem;
padding-left: 1rem; padding-left: 1rem;
gap: 20px; gap: 20px;
} }

16
resources/views/pdf-designs/playful.html
View File

@ -68,7 +68,6 @@
margin-top: 1rem; margin-top: 1rem;
padding: 1rem; padding: 1rem;
border-top: 1px solid #009e90; border-top: 1px solid #009e90;
border-bottom: 1px solid #009e90;
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
gap: 10px; gap: 10px;
@ -77,6 +76,10 @@
margin-top: 1rem; margin-top: 1rem;
padding: 1rem; padding: 1rem;
border-top: 1px solid #009e90; border-top: 1px solid #009e90;
}
.contact-wrapper-left-side,
.contact-wrapper-right-side {
border-bottom: 1px solid #009e90; border-bottom: 1px solid #009e90;
} }
@ -117,10 +120,14 @@
text-align: right; text-align: right;
} }
#product-table-footer {
page-break-inside: avoid;
}
#product-table-footer > * { #product-table-footer > * {
display: grid; display: grid;
grid-template-columns: 3fr 1fr 1fr; grid-template-columns: 3fr 1fr 1fr;
padding-top: 1rem; padding-top: 0.5rem;
padding-left: 1rem; padding-left: 1rem;
gap: 20px; gap: 20px;
} }
@ -164,7 +171,7 @@
</div> </div>
<div class="contacts-wrapper"> <div class="contacts-wrapper">
<div> <div class="contact-wrapper-left-side">
<p class="contact-label">$to_label:</p> <p class="contact-label">$to_label:</p>
<div class="company-info"> <div class="company-info">
<div id="company-details"></div> <div id="company-details"></div>
@ -172,9 +179,8 @@
</div> </div>
</div> </div>
<div> <div class="contact-wrapper-right-side">
<p class="contact-label">$from_label:</p> <p class="contact-label">$from_label:</p>
<div id="client-details"></div> <div id="client-details"></div>
</div> </div>
</div> </div>