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

Merge pull request #4125 from beganovich/v2-fix-font-size-variable

Browse Source 
Rename $font-size to $font_size & remove all comments from designs
This commit is contained in:
David Bomba 2020-10-01 21:45:00 +10:00 committed by GitHub
commit 92c65f73da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Utils/HtmlEngine.php
View File

@ -317,7 +317,7 @@ class HtmlEngine
$data['_rate2'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['_rate2'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['_rate3'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['_rate3'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$font-size'] = ['value' => $this->settings->font_size . 'px', 'label' => '']; $data['$font_size'] = ['value' => $this->settings->font_size . 'px', 'label' => ''];
$data['$invoiceninja.whitelabel'] = ['value' => asset('images/created-by-invoiceninja-new.png'), 'label' => '']; $data['$invoiceninja.whitelabel'] = ['value' => asset('images/created-by-invoiceninja-new.png'), 'label' => ''];

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

@ -13,7 +13,7 @@
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: '$font-size'; font-size: '$font_size';
} }
body { body {
@ -148,7 +148,7 @@
</head> </head>
<div class="header-wrapper" id="header"> <div class="header-wrapper" id="header">
<div><!-- Empty space placeholder--></div> <div></div>
<div id="company-details"></div> <div id="company-details"></div>
<div id="company-address"></div> <div id="company-address"></div>
@ -174,5 +174,5 @@
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>

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

@ -14,7 +14,7 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: '$font-size'; font-size: '$font_size';
} }
@page { @page {
@ -206,5 +206,5 @@
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>

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

@ -1,4 +1,3 @@
<!-- Template: Clean -->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head id="head"> <head id="head">
@ -15,7 +14,7 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: '$font-size'; font-size: '$font_size';
margin: 1cm; margin: 1cm;
} }
@ -160,11 +159,9 @@
<div id="client-details"></div> <div id="client-details"></div>
</div> </div>
<!-- product_table -->
<table id="product-table" cellspacing="0"></table> <table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>

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

@ -11,7 +11,7 @@
} }
* { * {
font-size: '$font-size'; font-size: '$font_size';
} }
p { p {
@ -170,5 +170,5 @@
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>

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

@ -11,7 +11,7 @@
} }
* { * {
font-size: '$font-size'; font-size: '$font_size';
} }
p { p {

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

@ -11,7 +11,7 @@
} }
* { * {
font-size: '$font-size'; font-size: '$font_size';
} }
p { p {
@ -209,5 +209,5 @@
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>

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

@ -11,7 +11,7 @@
} }
* { * {
font-size: '$font-size'; font-size: '$font_size';
} }
body { body {
@ -192,12 +192,10 @@
<tr> <tr>
<td class="page-footer-cell"> <td class="page-footer-cell">
<div class="footer-info"> <div class="footer-info">
<div style="margin-top: 195px"> <div style="margin-top: 195px"></div>
<!-- An offset div to space out table from footer -->
</div>
<div class="footer-wrapper" id="footer"> <div class="footer-wrapper" id="footer">
<div class="footer-content"> <div class="footer-content">
<div><!-- Placeholder for offset --></div> <div></div>
<div id="company-details"></div> <div id="company-details"></div>
<div id="company-address"></div> <div id="company-address"></div>
</div> </div>

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

@ -6,7 +6,7 @@
<style id="style"> <style id="style">
* { * {
font-size: '$font-size'; font-size: '$font_size';
} }
p { p {
@ -135,5 +135,5 @@
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>

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

@ -11,7 +11,7 @@
} }
* { * {
font-size: '$font-size'; font-size: '$font_size';
} }
p { p {
@ -163,9 +163,7 @@
alt="$company.name logo" alt="$company.name logo"
/> />
<div> <div></div>
<!-- Placeholder for empty space -->
</div>
<div class="entity-details-wrapper"> <div class="entity-details-wrapper">
<table id="entity-details" cellspacing="0"></table> <table id="entity-details" cellspacing="0"></table>
@ -192,5 +190,5 @@
<div id="product-table-footer" cellspacing="0"></div> <div id="product-table-footer" cellspacing="0"></div>
</body> </body>
<div id="footer"><!-- Your footer content here --></div> <div id="footer"></div>
</html> </html>