Merge pull request #1351 from batuhawk/master

Invoice template styles updated

public/css/print.css

@@ -39,6 +39,16 @@ th, td
     margin-left: 8px;
 }
 
+.mt-0
+{
+    margin-top: 0 !important;
+}
+
+.mt-1
+{
+    margin-top: 8px;
+}
+
 .mt-2
 {
     margin-top: 16px;
@@ -111,6 +121,41 @@ th, td
     padding-left: 16px;
 }
 
+.pl-3
+{
+    padding-left: 24px;
+}
+
+.pl-4
+{
+    padding-left: 32px;
+}
+
+.pl-5
+{
+    padding-left: 40px;
+}
+
+.pl-6
+{
+    padding-left: 48px;
+}
+
+.pl-7
+{
+    padding-left: 56px;
+}
+
+.pl-8
+{
+    padding-left: 64px;
+}
+
+.pl-9
+{
+    padding-left: 72px;
+}
+
 .border-1
 {
     border: 1px solid #e5e5e5;
@@ -149,7 +194,7 @@ th, td
 .text
 {
     color: #3c3f72;
-    margin-top:10px;
+    margin-top:8px;
     font-size: 13px;
 }
 
@@ -285,7 +330,7 @@ th, td
 .invoice-classic-inline-frame
 {
     margin: 0.3% 1% 0.3% 1%;
-    width: 95 !important;
+    width: 95% !important;
     height: 59px;
     border: 3px solid #3c3f72;
 }
@@ -337,21 +382,14 @@ th, td
 /*--Print Template Classic Finish--*/
 
 /*--Print Template Modern Start--*/
-.m-first-column
+.align-items-center
 {
-    padding-top: 15px;
-    padding-bottom:48px;
+    align-items: center !important;
 }
 
-.m-fc-left
+.d-flex
 {
-    padding-right: 30px;
-}
-
-.m-fc-right
-{
-    padding-left: 170px;
-     margin-top: -70px;
+    display: flex !important;
 }
 
 .m-note

resources/views/sales/invoices/print_default.blade.php

@@ -182,14 +182,14 @@
                         @stack($total->code . '_td_start')
                             <div class="border-top-1 py-2">
                                 <strong class="float-left">{{ trans($total->title) }}:</strong>
-                                <span>@money($total->amount, $invoice->currency_code, true)</span><br><br>
+                                <span>@money($total->amount, $invoice->currency_code, true)</span><br>
                             </div>
                         @stack($total->code . '_td_end')
                     @else
                         @if ($invoice->paid)
                             <div class="border-top-1 py-2">
                                 <strong class="float-left">{{ trans('invoices.paid') }}:</strong>
-                                <span>- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
+                                <span>- @money($invoice->paid, $invoice->currency_code, true)</span><br>
                             </div>
                         @endif
                         @stack('grand_total_td_start')

resources/views/sales/invoices/print_modern.blade.php

@@ -4,12 +4,11 @@
 
 @section('content')
     <div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
-        <div class="col-58 m-first-column">
-            <div class="text company pl-2 m-fc-left">
+        <div class="col-58">
+            <div class="text company pl-2 mb-1 d-flex align-items-center">
                 <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-            </div>
-            <div class="text company m-fc-right">
-                <strong class="text-white">{{ setting('company.name') }}</strong>
+
+                <strong class="pl-2 text-white">{{ setting('company.name') }}</strong>
             </div>
         </div>