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

unnecessary css lines deleted

Browse Source
This commit is contained in:
batuhanbas 2019-12-13 18:08:07 +03:00
parent 2451d5daf1
commit 6310980633
9 changed files with 88 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
public/css/custom.css vendored
View File

@ -19,14 +19,6 @@
/*--------General Button Hover Finish--------*/ /*--------General Button Hover Finish--------*/
/*--------Invoice, Bill Note--------*/
.show-note
{
width: 65% !important;
}
/*--------Invoice, Bill Note Finish--------*/
/*--------Dashboard Categories--------*/ /*--------Dashboard Categories--------*/
.dashboard-categories .dashboard-categories
{ {
@ -35,22 +27,13 @@
} }
/*--------Dashboard Categories Finish--------*/ /*--------Dashboard Categories Finish--------*/
/*--------Recurring Form Element--------*/
.recurring-hidden
{
position: absolute;
overflow: hidden;
z-index: -1;
}
/*--------Recurring Form Element Finish--------*/
/*--------Cursor Pointer--------*/
/*--------Attachment Cursor--------*/ .cursor-pointer
.form-attachment
{ {
cursor: pointer; cursor: pointer !important;
} }
/*--------Attachment Cursor Finish--------*/ /*--------Cursor Pointer Finish--------*/
/*--------Table Head Search--------*/ /*--------Table Head Search--------*/
@ -62,14 +45,6 @@
/*--------Table Head Search Finish--------*/ /*--------Table Head Search Finish--------*/
/*--------Login Logo--------*/
.login-logo
{
width: 22% !important;
}
/*--------Login Logo Finish--------*/
/*--------Wizard Steps--------*/ /*--------Wizard Steps--------*/
.wizard-header .wizard-header
{ {
@ -289,14 +264,6 @@
/*--------Index Page Tables Finish--------*/ /*--------Index Page Tables Finish--------*/
/*--------Categories Input--------*/
.color-box
{
min-width: 3rem;
}
/*--------Categories Input Finish--------*/
/*--------Left Menu Dropdown--------*/ /*--------Left Menu Dropdown--------*/
.menu-dropdown .menu-dropdown
{ {
@ -431,7 +398,7 @@
/*--------Company Name--------*/ /*--------Company Name--------*/
.d-grid .d-grid
{ {
display: grid; display: grid !important;
} }
/*--------Company Name Finish--------*/ /*--------Company Name Finish--------*/

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

@ -50,14 +50,14 @@
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@stack('timeline_body_create_bill_head_start') @stack('timeline_body_create_bill_head_start')
<h2>{{ trans('bills.create_bill') }}</h2> <h2 class="font-weight-500">{{ trans('bills.create_bill') }}</h2>
@stack('timeline_body_create_bill_head_end') @stack('timeline_body_create_bill_head_end')
@stack('timeline_body_create_bill_body_start') @stack('timeline_body_create_bill_body_start')
@stack('timeline_body_create_bill_body_message_start') @stack('timeline_body_create_bill_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500"> {{ trans_choice('general.statuses', 1) . ':' }}</h4> <h4 class="mb-0"> {{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-2">{{ trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small> <small class="pl-1">{{ trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
</div> </div>
@stack('timeline_body_create_bill_body_message_end') @stack('timeline_body_create_bill_body_message_end')
@ -80,15 +80,15 @@
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@stack('timeline_body_receive_bill_head_start') @stack('timeline_body_receive_bill_head_start')
<h2>{{ trans('bills.receive_bill') }}</h2> <h2 class="font-weight-500">{{ trans('bills.receive_bill') }}</h2>
@stack('timeline_body_receive_bill_head_end') @stack('timeline_body_receive_bill_head_end')
@stack('timeline_body_receive_bill_body_start') @stack('timeline_body_receive_bill_body_start')
@if ($bill->status->code == 'draft') @if ($bill->status->code == 'draft')
@stack('timeline_body_receive_bill_body_message_start') @stack('timeline_body_receive_bill_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-2">{{ trans('bills.messages.status.receive.draft') }}</small> <small class="pl-1">{{ trans('bills.messages.status.receive.draft') }}</small>
</div> </div>
@stack('timeline_body_receive_bill_body_message_end') @stack('timeline_body_receive_bill_body_message_end')
@ -102,8 +102,8 @@
@else @else
@stack('timeline_body_receive_bill_body_message_start') @stack('timeline_body_receive_bill_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-2">{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small> <small class="pl-1">{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}</small>
</div> </div>
@stack('timeline_body_receive_bill_body_message_end') @stack('timeline_body_receive_bill_body_message_end')
@endif @endif
@ -120,18 +120,20 @@
<div class="timeline-content"> <div class="timeline-content">
@stack('timeline_body_make_payment_head_start') @stack('timeline_body_make_payment_head_start')
<h2>{{ trans('bills.make_payment') }}</h2> <h2 class="font-weight-500">{{ trans('bills.make_payment') }}</h2>
@stack('timeline_body_make_payment_head_end') @stack('timeline_body_make_payment_head_end')
@stack('timeline_body_make_payment_body_start') @stack('timeline_body_make_payment_body_start')
@stack('timeline_body_get_paid_body_message_start') @stack('timeline_body_get_paid_body_message_start')
@if($bill->status->code != 'paid' && empty($bill->transactions->count())) @if($bill->status->code != 'paid' && empty($bill->transactions->count()))
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500"> {{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('bills.messages.status.paid.await') }}</small> <h4 class="mb-0"> {{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('bills.messages.status.paid.await') }}</small>
</div> </div>
@else @else
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('general.partially_paid') }}</small> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('general.partially_paid') }}</small>
</div> </div>
@endif @endif
@stack('timeline_body_make_payment_body_message_end') @stack('timeline_body_make_payment_body_message_end')
@ -342,7 +344,7 @@
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center pl-6">{{ $item->quantity }}</td> <td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
@ -372,7 +374,7 @@
<tr> <tr>
<th> <th>
<p class="form-control-label">{{ trans_choice('general.notes', 2) }}:</p> <p class="form-control-label">{{ trans_choice('general.notes', 2) }}:</p>
<p class="form-control text-muted show-note long-texts">{{ $bill->notes }}</p> <p class="form-control text-muted long-texts">{{ $bill->notes }}</p>
</th> </th>
</tr> </tr>
@endif @endif
@ -537,7 +539,7 @@
@foreach($bill->transactions as $transaction) @foreach($bill->transactions as $transaction)
<tr> <tr>
<td>@date($item->paid_at)</td> <td>@date($item->paid_at)</td>
<td class="text-right">@money($transaction->amount, $transaction->currency_code, true)</td> <td>@money($transaction->amount, $transaction->currency_code, true)</td>
<td>{{ $transaction->account->name }}</td> <td>{{ $transaction->account->name }}</td>
<td> <td>
@if ($transaction->reconciled) @if ($transaction->reconciled)

4
resources/views/incomes/invoices/print.blade.php
View File

@ -197,7 +197,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row mt-5">
<div class="col-md-7"> <div class="col-md-7">
<div class="table-responsive"> <div class="table-responsive">
@stack('notes_input_start') @stack('notes_input_start')
@ -207,7 +207,7 @@
<tr> <tr>
<th> <th>
<p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p> <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
<p class="form-control text-muted show-note">{{ $invoice->notes }}</p> <p class="form-control text-muted">{{ $invoice->notes }}</p>
</th> </th>
</tr> </tr>
</tbody> </tbody>

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

@ -50,14 +50,14 @@
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@stack('timeline_body_create_invoice_head_start') @stack('timeline_body_create_invoice_head_start')
<h2>{{ trans('invoices.create_invoice') }}</h2> <h2 class="font-weight-500">{{ trans('invoices.create_invoice') }}</h2>
@stack('timeline_body_create_invoice_head_end') @stack('timeline_body_create_invoice_head_end')
@stack('timeline_body_create_invoice_body_start') @stack('timeline_body_create_invoice_body_start')
@stack('timeline_body_create_invoice_body_message_start') @stack('timeline_body_create_invoice_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500"> {{ trans_choice('general.statuses', 1) . ':' }}</h4> <h4 class="mb-0"> {{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-2">{{ trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small> <small class="pl-1">{{ trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
</div> </div>
@stack('timeline_body_create_invoice_body_message_end') @stack('timeline_body_create_invoice_body_message_end')
@ -80,14 +80,15 @@
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@stack('timeline_body_send_invoice_head_start') @stack('timeline_body_send_invoice_head_start')
<h2>{{ trans('invoices.send_invoice') }}</h2> <h2 class="font-weight-500">{{ trans('invoices.send_invoice') }}</h2>
@stack('timeline_body_send_invoice_head_end') @stack('timeline_body_send_invoice_head_end')
@stack('timeline_body_send_invoice_body_start') @stack('timeline_body_send_invoice_body_start')
@if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial' && $invoice->status->code != 'viewed') @if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial' && $invoice->status->code != 'viewed')
@stack('timeline_body_send_invoice_body_message_start') @stack('timeline_body_send_invoice_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('invoices.messages.status.send.draft') }}</small> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('invoices.messages.status.send.draft') }}</small>
</div> </div>
@stack('timeline_body_send_invoice_body_message_end') @stack('timeline_body_send_invoice_body_message_end')
@ -117,13 +118,15 @@
@elseif($invoice->status->code == 'viewed') @elseif($invoice->status->code == 'viewed')
@stack('timeline_body_viewed_invoice_body_message_start') @stack('timeline_body_viewed_invoice_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('invoices.messages.status.viewed') }}</small> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('invoices.messages.status.viewed') }}</small>
</div> </div>
@stack('timeline_body_viewed_invoice_body_message_end') @stack('timeline_body_viewed_invoice_body_message_end')
@else @else
@stack('timeline_body_send_invoice_body_message_start') @stack('timeline_body_send_invoice_body_message_start')
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('invoices.messages.status.send.sent', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}</small>
</div> </div>
@stack('timeline_body_send_invoice_body_message_end') @stack('timeline_body_send_invoice_body_message_end')
@endif @endif
@ -140,18 +143,20 @@
<div class="timeline-content"> <div class="timeline-content">
@stack('timeline_body_get_paid_head_start') @stack('timeline_body_get_paid_head_start')
<h2>{{ trans('invoices.get_paid') }}</h2> <h2 class="font-weight-500">{{ trans('invoices.get_paid') }}</h2>
@stack('timeline_body_get_paid_head_end') @stack('timeline_body_get_paid_head_end')
@stack('timeline_body_get_paid_body_start') @stack('timeline_body_get_paid_body_start')
@stack('timeline_body_get_paid_body_message_start') @stack('timeline_body_get_paid_body_message_start')
@if($invoice->status->code != 'paid' && empty($invoice->transactions->count())) @if($invoice->status->code != 'paid' && empty($invoice->transactions->count()))
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('invoices.messages.status.paid.await') }}</small> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('invoices.messages.status.paid.await') }}</small>
</div> </div>
@else @else
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<h4 class="mb-0 font-weight-500">{{ trans_choice('general.statuses', 1) . ':' }}</h4> <small class="pl-2">{{ trans('general.partially_paid') }}</small> <h4 class="mb-0">{{ trans_choice('general.statuses', 1) . ':' }}</h4>
<small class="pl-1">{{ trans('general.partially_paid') }}</small>
</div> </div>
@endif @endif
@stack('timeline_body_get_paid_body_message_end') @stack('timeline_body_get_paid_body_message_end')
@ -364,7 +369,7 @@
@stack('name_td_end') @stack('name_td_end')
@stack('quantity_td_start') @stack('quantity_td_start')
<td class="col-xs-4 col-sm-3 text-center pl-6">{{ $item->quantity }}</td> <td class="col-xs-4 col-sm-3 text-center">{{ $item->quantity }}</td>
@stack('quantity_td_end') @stack('quantity_td_end')
@stack('price_td_start') @stack('price_td_start')
@ -394,7 +399,7 @@
<tr> <tr>
<th> <th>
<p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p> <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
<p class="form-control text-muted show-note long-texts">{{ $invoice->notes }}</p> <p class="form-control text-muted long-texts">{{ $invoice->notes }}</p>
</th> </th>
</tr> </tr>
@endif @endif
@ -582,7 +587,7 @@
@foreach($invoice->transactions as $transaction) @foreach($invoice->transactions as $transaction)
<tr> <tr>
<td>@date($transaction->paid_at)</td> <td>@date($transaction->paid_at)</td>
<td class="text-right">@money($transaction->amount, $transaction->currency_code, true)</td> <td>@money($transaction->amount, $transaction->currency_code, true)</td>
<td>{{ $transaction->account->name }}</td> <td>{{ $transaction->account->name }}</td>
<td> <td>
@if ($transaction->reconciled) @if ($transaction->reconciled)

2
resources/views/layouts/auth.blade.php
View File

@ -12,7 +12,7 @@
<div class="header-body text-center mb-5"> <div class="header-body text-center mb-5">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-xl-5 col-lg-6 col-md-8"> <div class="col-xl-5 col-lg-6 col-md-8">
<img class="login-logo pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting"/> <img class="pb-5" src="{{ asset('public/img/akaunting-logo-white.png') }}" width="22%" alt="Akaunting"/>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/layouts/install.blade.php
View File

@ -10,7 +10,7 @@
<div class="header-body text-center mb-5"> <div class="header-body text-center mb-5">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-xl-5 col-lg-6 col-md-8"> <div class="col-xl-5 col-lg-6 col-md-8">
<img class="login-logo pb-6" src="{{ asset('public/img/akaunting-logo-white.png') }}" alt="Akaunting"/> <img class="pb-6" src="{{ asset('public/img/akaunting-logo-white.png') }}" width="22%" alt="Akaunting"/>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/partials/form/file_group.blade.php
View File

@ -6,7 +6,7 @@
<div class="custom-file"> <div class="custom-file">
{!! Form::file($name, array_merge([ {!! Form::file($name, array_merge([
'class' => 'custom-file-input form-attachment cursor', 'class' => 'custom-file-input cursor-pointer',
'@input' => 'onHandleFileUpload("' . $name .'", $event)' '@input' => 'onHandleFileUpload("' . $name .'", $event)'
], $attributes)) !!} ], $attributes)) !!}
{!! Form::label($name, $text, ['class' => 'custom-file-label']) !!} {!! Form::label($name, $text, ['class' => 'custom-file-label']) !!}

2
resources/views/portal/invoices/show.blade.php
View File

@ -217,7 +217,7 @@
<th> <th>
@if ($invoice->notes) @if ($invoice->notes)
<p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p> <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
<p class="form-control text-muted show-note">{{ $invoice->notes }}</p> <p class="form-control text-muted long-texts">{{ $invoice->notes }}</p>
@endif @endif
</th> </th>
</tr> </tr>

75
resources/views/portal/invoices/signed.blade.php
View File

@ -13,9 +13,9 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row mx--4"> <div class="row mx--4">
<div class="col-md-7 border-bottom-1"> <div class="col-md-7 border-bottom-1">
<div class="table-responsive mt-2"> <div class="table-responsive mt-2">
<table class="table table-borderless"> <table class="table table-borderless">
<tbody> <tbody>
<tr> <tr>
@ -33,6 +33,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-md-5 border-bottom-1"> <div class="col-md-5 border-bottom-1">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-borderless"> <table class="table table-borderless">
@ -138,39 +139,48 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row show-table">
<div class="col-md-12 table-responsive"> <div class="col-md-12 table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<tbody> <tbody>
<tr>
<th class="pl-5">{{ trans_choice('general.items', 1) }}</th>
<th class="text-center">{{ trans('invoices.quantity') }}</th>
<th class="text-center pl-7">{{ trans('invoices.price') }}</th>
<th class="text-right pr-5">{{ trans('invoices.total') }}</th>
</tr>
@foreach($invoice->items as $item)
<tr> <tr>
<td class="pl-5">{{ $item->name }}</td> <th class="pl-5">{{ trans_choice('general.items', 1) }}</th>
<td class="text-center">{{ $item->quantity }}</td> <th class="text-center">{{ trans('invoices.quantity') }}</th>
<td class="text-center pl-7">@money($item->price, $invoice->currency_code, true)</td> <th class="text-center pl-7">{{ trans('invoices.price') }}</th>
<td class="text-right pr-5">@money($item->total, $invoice->currency_code, true)</td> <th class="text-right pr-5">{{ trans('invoices.total') }}</th>
</tr> </tr>
@endforeach @foreach($invoice->items as $item)
</tbody> <tr>
</table> <td class="pl-5">{{ $item->name }}</td>
</div> <td class="text-center">{{ $item->quantity }}</td>
</div> <td class="text-center pl-7">@money($item->price, $invoice->currency_code, true)</td>
<td class="text-right pr-5">@money($item->total, $invoice->currency_code, true)</td>
<div class="card-body"> </tr>
<div class="row"> @endforeach
<div class="col-md-7"> </tbody>
@if ($invoice->notes) </table>
<p class="form-control-label pl-4">{{ trans_choice('general.notes', 2) }}</p>
<p class="form-control text-muted show-note ml-4">{{ $invoice->notes }}</p>
@endif
</div> </div>
</div>
<div class="row mt-5">
<div class="col-md-7">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<tr>
<th>
@if ($invoice->notes)
<p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
<p class="form-control text-muted long-texts">{{ $invoice->notes }}</p>
@endif
</th>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-md-5"> <div class="col-md-5">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table">
@ -219,6 +229,7 @@
@endif @endif
@endif @endif
</div> </div>
<div class="col-md-8 text-right"> <div class="col-md-8 text-right">
<a href="{{ $print_action }}" target="_blank" class="btn btn-success"> <a href="{{ $print_action }}" target="_blank" class="btn btn-success">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }} <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}