fix conflicts

2026-02-08 11:52:40 -05:00 · 2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -89,7 +89,7 @@
        }

        .bill-add {
-            display: inline;
+            display: block;
            float:left;
            width:40%;
            padding: 0 0 0 30px;
@@ -146,6 +146,7 @@
            line-height: 15px;
            color: #595959;
            margin: 0px;
+            width: 160px;
        }

        .ship-user-phone {
@@ -184,6 +185,7 @@
            line-height: 15px;
            color: #595959;
            margin:0px;
+            width: 160px;
        }

        .bill-user-phone {