Skip to content

Commit

Permalink
Pixel perfect development edited
Browse files Browse the repository at this point in the history
  • Loading branch information
@brkcvn
brkcvn committed Jun 7, 2021
1 parent 6e9edbb commit 3d0752e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 11 deletions.
21 changes: 18 additions & 3 deletions public/css/custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1634,9 +1634,14 @@ table .align-items-center td span.badge {
/* Select Tag Fixed Content Finish */

/* Line item */
.line-item-link-container {
height: 25px;
}

.line-item-link {
display: flex;
padding-bottom:10px;
padding-bottom: 10px;
top: -12px;
}

.line-item-area {
Expand All @@ -1648,7 +1653,17 @@ table .align-items-center td span.badge {
.line-item-content {
position: relative;
width: 100%;
max-width:242px;
max-width: 242px;
}

.line-item-content .form-group {
position: relative;
}

.line-item-content .badge {
position: absolute !important;
bottom: 12px;
right: 0;
}

.line-item-content-right {
Expand Down Expand Up @@ -1679,4 +1694,4 @@ table .align-items-center td span.badge {
}}
}

/* Line item */
/* Line item */
4 changes: 3 additions & 1 deletion resources/views/components/documents/form/line-item.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ class="form-control text-center p-0"
</td>
<td class="border-top-0 p-0" colspan="4">
@if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link">
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link-container position-relative">
<div v-if="!row.add_tax || !row.add_discount" class="line-item-link position-absolute">
<div class="text-left border-0 p-0 mr-5">
<div>
<button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">
Expand All @@ -150,6 +151,7 @@ class="form-control text-center p-0"
</div>
</div>
</div>
</div>
<div v-if="row.add_discount" class="line-item-area pb-3">
<div class="line-item-content">
<div class="long-texts line-item-text" style="float: left; margin-top: 15px; position: absolute; left: -65px;">
Expand Down
14 changes: 7 additions & 7 deletions resources/views/components/documents/form/totals.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<col class="document-total-50">
<col class="document-total-30">
<col class="document-total-25">
<col class="document-total-40-px">
<col class="document-total-50-px">
</colgroup>
<tbody id="invoice-total-rows" class="table-padding-05">
@stack('sub_total_td_start')
Expand All @@ -20,7 +20,7 @@
{{ Form::moneyGroup('sub_total', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'totals.sub', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
</div>
</td>
<td class="border-bottom-0 pb-0" style="max-width: 40px"></td>
<td class="border-bottom-0 pb-0" style="max-width: 50px"></td>
</tr>
@stack('sub_total_td_end')

Expand All @@ -36,7 +36,7 @@
{{ Form::moneyGroup('item_discount', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
</div>
</td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr>
@stack('item_discount_td_end')
@endif
Expand Down Expand Up @@ -92,7 +92,7 @@
</div>
{!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
</td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr>
@stack('add_discount_td_end')
@endif
Expand All @@ -109,7 +109,7 @@
{{ Form::moneyGroup('tax_total', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'tax.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
</div>
</td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr>
@stack('tax_total_td_end')

Expand All @@ -126,7 +126,7 @@
{{ Form::moneyGroup('grand_total', '', '', ['disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'totals.total', 'currency' => $currency, 'dynamic-currency' => 'currency', 'money-class' => 'text-right disabled-money'], 0.00, 'text-right disabled-money') }}
</div>
</td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr>
@stack('grand_total_td_end')

Expand All @@ -141,7 +141,7 @@
:currency-rate="form.currency_rate"
></akaunting-currency-conversion>
</td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 40px"></td>
<td class="border-top-0 pt-0 pb-0" style="max-width: 50px"></td>
</tr>
@stack('currency_conversion_td_end')
</tbody>
Expand Down

0 comments on commit 3d0752e

Please sign in to comment.