mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-04 01:34:35 -04:00
Merge pull request #5533 from beganovich/v5-2504-design-updates
(v5) Show footer outside the totals table
This commit is contained in:
commit
cb2fd47d3e
@ -440,10 +440,10 @@ class Design extends BaseDesign
|
||||
|
||||
$elements = [
|
||||
['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [
|
||||
['element' => 'p', 'content' => strtr($_variables['values']['$entity.public_notes'], $_variables), 'properties' => ['data-ref' => 'total_table-public_notes', 'style' => 'text-align: left;']],
|
||||
['element' => 'p', 'content' => '', 'properties' => ['style' => 'text-align: left; display: flex; flex-direction: column;'], 'elements' => [
|
||||
['element' => 'span', 'content' => '$entity.terms_label: ', 'properties' => ['hidden' => $this->entityVariableCheck('$entity.terms'), 'data-ref' => 'total_table-terms-label', 'style' => 'font-weight: bold; text-align: left; margin-top: 1rem;']],
|
||||
['element' => 'span', 'content' => strtr($_variables['values']['$entity.terms'], $_variables), 'properties' => ['data-ref' => 'total_table-terms', 'style' => 'text-align: left;']],
|
||||
['element' => 'span', 'content' => strtr($_variables['values']['$entity_footer'], $_variables), 'properties' => ['data-ref' => 'total_table-footer', 'style' => 'text-align: left; margin-top: 1rem;']],
|
||||
]],
|
||||
['element' => 'img', 'properties' => ['hidden' => $this->client->getSetting('signature_on_pdf'), 'style' => 'max-width: 50%; height: auto;', 'src' => '$contact.signature']],
|
||||
['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: flex; align-items: flex-start;'], 'elements' => [
|
||||
|
@ -216,7 +216,7 @@
|
||||
color: white;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
padding-top: 0.5rem
|
||||
}
|
||||
</style>
|
||||
@ -239,7 +239,7 @@
|
||||
<td class="page-footer-cell">
|
||||
<div class="footer-wrapper" id="footer">
|
||||
<div>
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
<div> <!-- #2 column --> </div>
|
||||
<div> <!-- #3 column --> </div>
|
||||
|
@ -219,7 +219,7 @@
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
padding-left: 1rem
|
||||
}
|
||||
</style>
|
||||
@ -257,5 +257,5 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
|
@ -187,7 +187,7 @@
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
padding-left: 1rem
|
||||
}
|
||||
</style>
|
||||
@ -223,5 +223,5 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
|
@ -179,7 +179,7 @@
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
padding-left: 1rem
|
||||
}
|
||||
</style>
|
||||
@ -221,5 +221,5 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
|
@ -173,7 +173,7 @@
|
||||
padding-right: 0.5rem;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
padding-left: 1rem
|
||||
}
|
||||
</style>
|
||||
@ -221,6 +221,6 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
|
||||
|
@ -258,5 +258,5 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
|
@ -223,7 +223,7 @@
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 2rem
|
||||
}
|
||||
@ -248,7 +248,7 @@
|
||||
<div class="footer-wrapper" id="footer">
|
||||
<div class="footer-content">
|
||||
<div>
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
<div id="company-details"></div>
|
||||
<div id="company-address"></div>
|
||||
|
@ -151,7 +151,7 @@
|
||||
padding-right: 1rem;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
padding-left: 1rem
|
||||
}
|
||||
</style>
|
||||
@ -185,5 +185,5 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer</p>
|
||||
</div>
|
||||
|
@ -222,7 +222,7 @@
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
[data-ref="total_table-public_notes"] {
|
||||
[data-ref="total_table-footer"] {
|
||||
text-align: left;
|
||||
padding-left: 3rem;
|
||||
padding-right: 3rem;
|
||||
@ -281,6 +281,6 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
<p data-ref="total_table-public_notes">$entity.public_notes</p>
|
||||
<p data-ref="total_table-footer">$entity_footer/p>
|
||||
</div>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user