shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #409 Fixed: Visual Bug - Invoice status color mismatch between invoices and show invoice

Browse Source
This commit is contained in:
cuneytsenturk 2018-07-10 12:05:36 +03:00
parent 7478cece45
commit 51b3e37856
3 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
public/css/app.css vendored
View File

@ -619,4 +619,46 @@ input[type="number"] {
.invoice, .bill {
border: none !important;
}
}
#badge div.label {
margin-top: 15px;
width: 180px;
margin-right: -30px;
position: absolute;
right: 0;
font-size: 14px;
z-index: 99;
-moz-transform: rotate(40deg);
-webkit-transform: rotate(40deg);
-ms-transform: rotate(40deg);
-o-transform: rotate(40deg);
transform: rotate(40deg);
border-radius: 0;
}
#badge .arrow-up {
position: absolute;
right: 0;
margin-right: 100px;
z-index: 999;
margin-top: -50px;
width: 0;
height: 0;
border-left: 25px solid transparent;
border-right: 25px solid transparent;
border-bottom: 25px solid #ecf0f5;
}
#badge .arrow-right {
position: absolute;
margin-top: 55px;
z-index: 999;
margin-right: -23px;
right: 0;
width: 0;
height: 0;
border-top: 20px solid transparent;
border-bottom: 20px solid transparent;
border-left: 20px solid #ecf0f5;
}

10
resources/views/expenses/bills/show.blade.php
View File

@ -17,7 +17,11 @@
<div class="box box-success">
<div class="bill">
<span class="badge bg-aqua">{{ $bill->status->name }}</span>
<div id="badge">
<div class="arrow-up"></div>
<div class="label {{ $bill->status->label }}">{{ $bill->status->name }}</div>
<div class="arrow-right"></div>
</div>
<div class="row invoice-header">
<div class="col-xs-7">
@ -156,10 +160,10 @@
<div class="box-footer row no-print">
<div class="col-xs-12">
<a href="{{ url('expenses/bills/' . $bill->id . '/edit') }}" class="btn btn-primary">
<a href="{{ url('expenses/bills/' . $bill->id . '/edit') }}" class="btn btn-default">
<i class="fa fa-pencil-square-o"></i>&nbsp; {{ trans('general.edit') }}
</a>
<a href="{{ url('expenses/bills/' . $bill->id . '/print') }}" target="_blank" class="btn btn-default">
<a href="{{ url('expenses/bills/' . $bill->id . '/print') }}" target="_blank" class="btn btn-success">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
<div class="btn-group dropup">

10
resources/views/incomes/invoices/show.blade.php
View File

@ -17,7 +17,11 @@
<div class="box box-success">
<section class="invoice">
<span class="badge bg-aqua">{{ $invoice->status->name }}</span>
<div id="badge">
<div class="arrow-up"></div>
<div class="label {{ $invoice->status->label }}">{{ $invoice->status->name }}</div>
<div class="arrow-right"></div>
</div>
<div class="row invoice-header">
<div class="col-xs-7">
@ -158,10 +162,10 @@
<div class="box-footer row no-print">
<div class="col-md-12">
<a href="{{ url('incomes/invoices/' . $invoice->id . '/edit') }}" class="btn btn-primary">
<a href="{{ url('incomes/invoices/' . $invoice->id . '/edit') }}" class="btn btn-default">
<i class="fa fa-pencil-square-o"></i>&nbsp; {{ trans('general.edit') }}
</a>
<a href="{{ url('incomes/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-default">
<a href="{{ url('incomes/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-success">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
<div class="btn-group dropup">