mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Tweaking clean to handle shipping address
This commit is contained in:
parent
813fc7bd5e
commit
eb550f65df
@ -364,12 +364,12 @@ class Design extends BaseDesign
|
||||
|
||||
if (in_array($_variable, $_customs) && !empty($this->entity->{$var})) {
|
||||
$elements[] = ['element' => 'div', 'properties' => ['style' => "display: table-row; visibility: {$this->entityVariableCheck($_variable)};"],'elements' => [
|
||||
['element' => 'div', 'content' => $variable . '_label', 'properties' => ['style' => 'display: table-cell;', 'data-ref' => 'entity_details-' . substr($variable, 1) . '_label']],
|
||||
['element' => 'div', 'content' => $variable . '_label', 'properties' => ['style' => 'display: table-cell; border-right:10px solid transparent; ', 'data-ref' => 'entity_details-' . substr($variable, 1) . '_label']],
|
||||
['element' => 'div', 'content' => $variable, 'properties' => ['style' => 'display: table-cell;', 'data-ref' => 'entity_details-' . substr($variable, 1)]],
|
||||
]];
|
||||
} else {
|
||||
$elements[] = ['element' => 'div', 'properties' => ['style' => "display: table-row; visibility: {$this->entityVariableCheck($variable)};"], 'elements' => [
|
||||
['element' => 'span', 'content' => $variable . '_label', 'properties' => ['style' => 'display: table-cell;','data-ref' => 'entity_details-' . substr($variable, 1) . '_label']],
|
||||
['element' => 'span', 'content' => $variable . '_label', 'properties' => ['style' => 'display: table-cell; border-right:10px solid transparent;','data-ref' => 'entity_details-' . substr($variable, 1) . '_label']],
|
||||
['element' => 'span', 'content' => $variable, 'properties' => ['style' => 'display: table-cell;','data-ref' => 'entity_details-' . substr($variable, 1)]],
|
||||
]];
|
||||
}
|
||||
|
@ -35,8 +35,8 @@
|
||||
}
|
||||
|
||||
span {
|
||||
margin-left:2px;
|
||||
margin-right:2px;
|
||||
|
||||
border-right:10px;
|
||||
}
|
||||
|
||||
#qr-bill {
|
||||
@ -95,34 +95,24 @@
|
||||
|
||||
#entity-details {
|
||||
display: flex;
|
||||
padding-right: 30px;
|
||||
flex-direction: column;
|
||||
line-height: var(--line-height);
|
||||
padding-right: 5px;
|
||||
white-space: nowrap;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
#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);
|
||||
margin-right: auto;
|
||||
padding-right: 30px;
|
||||
}
|
||||
|
||||
#shipping-details {
|
||||
display: flex;
|
||||
float:right;
|
||||
flex-direction: column;
|
||||
line-height: var(--line-height);
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
#client-details > :first-child {
|
||||
|
Loading…
x
Reference in New Issue
Block a user