Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 10:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4019 from beganovich/v2-invoice-design-improvements

Browse Source 
Update designs with new margins & paddings
This commit is contained in:
David Bomba 2020-08-27 23:11:13 +10:00 committed by GitHub
commit 39f23a2c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 117 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Utils/HtmlEngine.php
View File

@ -95,8 +95,8 @@ class HtmlEngine
} }
$data = []; $data = [];
$data['$global-margin'] = ['value' => 'm-12', 'label' => '']; $data['$global-margin'] = ['value' => 'm-8', 'label' => ''];
$data['$global-padding'] = ['value' => 'p-12', 'label' => '']; $data['$global-padding'] = ['value' => 'p-8', 'label' => ''];
$data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => '']; $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
$data['$from'] = ['value' => '', 'label' => ctrans('texts.from')]; $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];

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

@ -12,9 +12,16 @@
</head> </head>
<style> <style>
#product-table tbody > tr:nth-child(even) { tbody > tr:nth-child(even) {
background-color: #edf2f7; background-color: #edf2f7;
} }
/** Required for proper margins on print **/
@page {
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style> </style>
<body class="antialiased break-words bg-white"> <body class="antialiased break-words bg-white">
@ -36,7 +43,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- Client details, entity details --> <!-- Client details, entity details -->
<div class="grid grid-cols-12 gap-4 my-12 ml-12"> <div class="grid grid-cols-12 gap-4 my-12 ml-12">
@ -60,7 +66,10 @@
<!-- Product table --> <!-- Product table -->
<div class="$global-margin"> <div class="$global-margin">
<table id="product-table" class="w-full mt-8 table-auto"></table> <table
id="product-table"
class="w-full table-auto mt-8 $table-padding"
></table>
</div> </div>
</body> </body>

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

@ -25,6 +25,14 @@
tbody > tr > td:first-child { tbody > tr > td:first-child {
color: #d03801; color: #d03801;
} }
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style> </style>
<body class="$global-margin bg-white break-words antialiased"> <body class="$global-margin bg-white break-words antialiased">
@ -68,7 +76,7 @@
<!-- Product table --> <!-- Product table -->
<table <table
id="product-table" id="product-table"
class="w-full mt-20 rounded table-auto" class="w-full mt-20 rounded table-auto $table-padding"
></table> ></table>
</body> </body>

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

@ -15,6 +15,14 @@
#product-table tbody > tr:nth-child(even) { #product-table tbody > tr:nth-child(even) {
background-color: #f7fafc; background-color: #f7fafc;
} }
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style> </style>
<body class="$global-margin bg-white break-words antialiased"> <body class="$global-margin bg-white break-words antialiased">
@ -34,7 +42,7 @@
</div> </div>
<!-- Entity labels, client details --> <!-- Entity labels, client details -->
<p class="mt-10 px-2 text-xl text-blue-500 uppercase">$entity_label</p> <p class="px-2 mt-10 text-xl text-blue-500 uppercase">$entity_label</p>
<div class="grid grid-cols-12 px-2 py-3 mt-4 border-t border-b"> <div class="grid grid-cols-12 px-2 py-3 mt-4 border-t border-b">
<div class="col-span-6"> <div class="col-span-6">
<table id="entity-details"></table> <table id="entity-details"></table>
@ -43,7 +51,10 @@
</div> </div>
<!-- Product table --> <!-- Product table -->
<table id="product-table" class="table-auto mt-12 w-full"></table> <table
id="product-table"
class="table-auto w-full mt-12 $table-padding"
></table>
</body> </body>
<footer id="footer"></footer> <footer id="footer"></footer>

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

@ -19,6 +19,14 @@
#product-table tbody > tr:nth-child(odd) { #product-table tbody > tr:nth-child(odd) {
background-color: #f7fafc; background-color: #f7fafc;
} }
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style> </style>
<body class="$global-margin antialiased bg-white break-words"> <body class="$global-margin antialiased bg-white break-words">
@ -61,7 +69,7 @@
<table <table
id="product-table" id="product-table"
class="w-full mt-10 border-t-4 border-pink-700 table-auto" class="w-full mt-10 border-t-4 border-pink-700 table-auto $table-padding"
></table> ></table>
</body> </body>

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

@ -11,6 +11,16 @@
<link rel="stylesheet" href="$app_url/css/tailwindcss@1.4.6.css" /> <link rel="stylesheet" href="$app_url/css/tailwindcss@1.4.6.css" />
</head> </head>
<style>
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style>
<body class="$global-margin antialiased bg-white break-words"> <body class="$global-margin antialiased bg-white break-words">
<!-- Company logo, entity details --> <!-- Company logo, entity details -->
<div class="grid grid-cols-12 gap-4 pb-6 border-b-4 border-black"> <div class="grid grid-cols-12 gap-4 pb-6 border-b-4 border-black">
@ -44,16 +54,19 @@
</div> </div>
<!-- Product table --> <!-- Product table -->
<table id="product-table" class="w-full mt-10 table-auto"></table> <table
id="product-table"
class="w-full mt-10 table-auto $table-padding"
></table>
<!-- Thanks label --> <!-- Thanks label -->
<p <div id="footer">
class="w-full pb-4 mt-10 text-2xl font-semibold text-center border-b-4 border-black" <p
> class="w-full pb-4 mt-10 text-2xl font-semibold text-center border-b-4 border-black"
$thanks_label >
</p> $thanks_label
<div class="w-full border-black order-b wpy-1"></div> </p>
<div class="w-full border-black order-b wpy-1"></div>
</div>
</body> </body>
<footer id="footer"></footer>
</html> </html>

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

@ -11,6 +11,16 @@
<link rel="stylesheet" href="$app_url/css/tailwindcss@1.4.6.css" /> <link rel="stylesheet" href="$app_url/css/tailwindcss@1.4.6.css" />
</head> </head>
<style>
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style>
<body class="$global-margin antialiased break-words bg-white"> <body class="$global-margin antialiased break-words bg-white">
<!-- Company details, address, client details, company logo --> <!-- Company details, address, client details, company logo -->
<div class="grid grid-cols-12 gap-4"> <div class="grid grid-cols-12 gap-4">
@ -49,7 +59,10 @@
></div> ></div>
<!-- Product table --> <!-- Product table -->
<table id="product-table" class="w-full mt-10 table-auto"></table> <table
id="product-table"
class="w-full mt-10 table-auto $table-padding"
></table>
</body> </body>
<footer id="footer"></footer> <footer id="footer"></footer>

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

@ -30,8 +30,8 @@
<div class="$global-margin"> <div class="$global-margin">
<!-- Company logo, client details --> <!-- Company logo, client details -->
<div class="col-span-12 mb-10"> <div class="col-span-12 mt-6 mb-10">
<p class="text-xl text-orange-600 font-semibold uppercase"> <p class="text-xl font-semibold text-orange-600 uppercase">
$your_entity_label $your_entity_label
</p> </p>
</div> </div>
@ -45,11 +45,14 @@
</div> </div>
<!-- Product table --> <!-- Product table -->
<table id="product-table" class="w-full mt-8 table-auto"></table> <table
id="product-table"
class="w-full mt-8 mb-10 table-auto $table-padding"
></table>
</div> </div>
<!-- Company details --> <!-- Company details -->
<div class="bg-orange-600"> <footer id="footer" class="fixed bottom-0 w-full bg-orange-600">
<div class="$global-padding"> <div class="$global-padding">
<div class="grid grid-cols-12"> <div class="grid grid-cols-12">
<div <div
@ -60,8 +63,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </footer>
</body> </body>
<footer id="footer"></footer>
</html> </html>

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

@ -11,6 +11,16 @@
<link rel="stylesheet" href="$app_url/css/tailwindcss@1.4.6.css" /> <link rel="stylesheet" href="$app_url/css/tailwindcss@1.4.6.css" />
</head> </head>
<style>
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style>
<body class="$global-margin antialiased break-words bg-white"> <body class="$global-margin antialiased break-words bg-white">
<!-- Company name, company address, company logo --> <!-- Company name, company address, company logo -->
<div class="grid grid-cols-12 gap-4"> <div class="grid grid-cols-12 gap-4">
@ -35,7 +45,7 @@
<!-- Client details --> <!-- Client details -->
<div class="grid grid-cols-12 mt-12"> <div class="grid grid-cols-12 mt-12">
<div class="col-span-12 mb-10"> <div class="col-span-12 mb-10">
<p class="text-xl text-black font-semibold uppercase"> <p class="text-xl font-semibold text-black uppercase">
$your_entity_label $your_entity_label
</p> </p>
</div> </div>
@ -43,7 +53,10 @@
</div> </div>
<!-- Product table --> <!-- Product table -->
<table id="product-table" class="w-full mt-8 table-auto"></table> <table
id="product-table"
class="w-full mt-8 table-auto $table-padding"
></table>
</body> </body>
<footer id="footer"></footer> <footer id="footer"></footer>

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

@ -20,6 +20,14 @@
color: #9b2c2c; color: #9b2c2c;
font-weight: bold; font-weight: bold;
} }
/** Required for proper margins on print **/
@page {
margin-top: 8.5mm;
margin-bottom: 8.5mm;
}
/** Custom CSS goes here.. */
</style> </style>
<body class="$global-margin antialiased bg-white break-words"> <body class="$global-margin antialiased bg-white break-words">
@ -40,7 +48,7 @@
<!-- Company details, client details --> <!-- Company details, client details -->
<div class="grid grid-cols-12 gap-12 mt-12"> <div class="grid grid-cols-12 gap-12 mt-12">
<div class="col-span-12"> <div class="col-span-12">
<p class="text-xl text-teal-600 font-semibold uppercase"> <p class="text-xl font-semibold text-teal-600 uppercase">
$your_entity_label $your_entity_label
</p> </p>
</div> </div>
@ -64,7 +72,10 @@
</div> </div>
<!-- Product table --> <!-- Product table -->
<table id="product-table" class="w-full mt-10 table-auto"></table> <table
id="product-table"
class="w-full mt-10 table-auto $table-padding"
></table>
</body> </body>
<footer id="footer"></footer> <footer id="footer"></footer>