mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-27 11:41:09 -04:00
fix conflict
This commit is contained in:
@ -1,8 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title>Payment</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
|
||||
<style type="text/css">
|
||||
/* -- Base -- */
|
||||
@ -15,6 +16,7 @@
|
||||
padding: 0px;
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
@ -51,12 +53,14 @@
|
||||
color: #817AE3;
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
.company-address-container {
|
||||
width: 50%;
|
||||
text-transform: capitalize;
|
||||
padding-left: 80px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
/* .header-section-right {
|
||||
display:inline-block;
|
||||
position: absolute;
|
||||
@ -77,7 +81,7 @@
|
||||
/* -- Company Address -- */
|
||||
|
||||
.company-details h1 {
|
||||
margin:0;
|
||||
margin: 0;
|
||||
|
||||
font-weight: bold;
|
||||
font-size: 15px;
|
||||
@ -87,7 +91,7 @@
|
||||
max-width: 220px;
|
||||
}
|
||||
|
||||
.company-address{
|
||||
.company-address {
|
||||
/* margin-top: 12px; */
|
||||
font-size: 12px;
|
||||
line-height: 15px;
|
||||
@ -108,8 +112,8 @@
|
||||
/* -- Customer Address -- */
|
||||
.customer-address-container {
|
||||
display: block;
|
||||
float:left;
|
||||
width:40%;
|
||||
float: left;
|
||||
width: 40%;
|
||||
padding: 0 0 0 30px;
|
||||
}
|
||||
|
||||
@ -167,7 +171,7 @@
|
||||
font-size: 10px;
|
||||
line-height: 15px;
|
||||
color: #595959;
|
||||
margin:0px;
|
||||
margin: 0px;
|
||||
width: 180px;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
@ -258,7 +262,7 @@
|
||||
color: #595959;
|
||||
}
|
||||
|
||||
.total-display-box .total-color {
|
||||
.total-display-box .amount {
|
||||
float: right;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
@ -268,6 +272,7 @@
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="header-container">
|
||||
<table width="100%">
|
||||
@ -336,7 +341,8 @@
|
||||
</div>
|
||||
<div class="total-display-box">
|
||||
<p class="total-display-label">@lang('pdf_payment_amount_received_label')</p>
|
||||
<span class="total-color">{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
|
||||
<span class="amount">{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user