1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00

Unified margin across designs

This commit is contained in:
Benjamin Beganović 2021-01-14 15:57:14 +01:00
parent 4967ffb668
commit 1c5c7250ee
10 changed files with 65 additions and 85 deletions

View File

@ -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')];

View File

@ -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>

View File

@ -168,13 +168,6 @@
font-weight: bold !important;
}
@media print {
body {
margin-top: 0;
margin-right: 0;
}
}
#table-totals {
page-break-inside: avoid;
}

View File

@ -9,6 +9,9 @@
-moz-osx-font-smoothing: grayscale;
font-family: Arial, Helvetica, sans-serif;
font-size: "$font_size";
}
@page {
margin: $global_margin;
}

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;