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

Merge pull request #1086 from batuhawk/master

Browse Source 
Email tag styles updated
This commit is contained in:
Batuhan Baş 2020-01-05 15:24:06 +03:00 committed by GitHub
commit 1849533adc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/akaunting-color.css vendored
View File

@ -1936,10 +1936,6 @@ button.bg-green:focus {
width: 30px; width: 30px;
height: 30px; height: 30px;
} }
.border-radius-0 {
border-radius: 0 !important;
}
/*--Left Menu Icon Finish--*/ /*--Left Menu Icon Finish--*/
/*--Unselected Text Color--*/ /*--Unselected Text Color--*/

23
public/css/custom.css vendored
View File

@ -77,7 +77,6 @@ button:focus
border-radius: calc(0.375rem - 1px) calc(0.375rem - 1px) 0 0; border-radius: calc(0.375rem - 1px) calc(0.375rem - 1px) 0 0;
} }
.wizard-steps .wizard-steps
{ {
width: 3.375rem; width: 3.375rem;
@ -119,21 +118,20 @@ button:focus
/*--------Wizard Steps Finish--------*/ /*--------Wizard Steps Finish--------*/
/*--------Border Radius 0--------*/ /*--------Border Radius None--------*/
.border-radius-0 .border-radius-none
{ {
border-radius: 0 !important; border-radius: 0 !important;
} }
/*--------Border Radius 0 Finished--------*/ /*--------Border Radius None Finished--------*/
/*--------Border Radius 5--------*/ /*--------Border Radius Default--------*/
.border-radius-5 .border-radius-default
{ {
border-radius: 5px !important; border-radius: 0.25rem !important
} }
/*--------Border Radius 5 Finished--------*/ /*--------Border Radius Default Finished--------*/
.dropup .dropdown-toggle::after .dropup .dropdown-toggle::after
{ {
@ -311,6 +309,13 @@ button:focus
} }
/*--------Border Top Finish--------*/ /*--------Border Top Finish--------*/
/*--------Border--------*/
.border-1
{
border: 1px solid #e5e5e5 !important;
}
/*--------Border Finish--------*/
/*--------Border Bottom--------*/ /*--------Border Bottom--------*/
.border-bottom-1 .border-bottom-1

6
resources/views/modals/settings/invoice_template.blade.php
View File

@ -12,7 +12,7 @@
]) !!} ]) !!}
<div class="row"> <div class="row">
<div class="col-md-4 text-center px-0"> <div class="col-md-4 text-center px-0">
<div class="bg-print border-radius-5 print-edge choose" @click="invoice_form.template='default'"> <div class="bg-print border-radius-default print-edge choose" @click="invoice_form.template='default'">
<img src="{{ asset('public/img/invoice_templates/default.png') }}" class="mb-1 mt-3" height="200" alt="Default"/> <img src="{{ asset('public/img/invoice_templates/default.png') }}" class="mb-1 mt-3" height="200" alt="Default"/>
<label> <label>
<input type="radio" name="template" value="default" v-model="invoice_form.template"> <input type="radio" name="template" value="default" v-model="invoice_form.template">
@ -22,7 +22,7 @@
</div> </div>
<div class="col-md-4 text-center px-0"> <div class="col-md-4 text-center px-0">
<div class="bg-print border-radius-5 print-edge choose" @click="invoice_form.template='classic'"> <div class="bg-print border-radius-default print-edge choose" @click="invoice_form.template='classic'">
<img src="{{ asset('public/img/invoice_templates/classic.png') }}" class="mb-1 mt-3" height="200" alt="Classic"/> <img src="{{ asset('public/img/invoice_templates/classic.png') }}" class="mb-1 mt-3" height="200" alt="Classic"/>
<label> <label>
<input type="radio" name="template" value="classic" v-model="invoice_form.template"> <input type="radio" name="template" value="classic" v-model="invoice_form.template">
@ -32,7 +32,7 @@
</div> </div>
<div class="col-md-4 text-center px-0"> <div class="col-md-4 text-center px-0">
<div class="bg-print border-radius-5 print-edge choose" @click="invoice_form.template='modern'"> <div class="bg-print border-radius-default print-edge choose" @click="invoice_form.template='modern'">
<img src="{{ asset('public/img/invoice_templates/modern.png') }}" class="mb-1 mt-3" height="200" alt="Modern"/> <img src="{{ asset('public/img/invoice_templates/modern.png') }}" class="mb-1 mt-3" height="200" alt="Modern"/>
<label> <label>
<input type="radio" name="template" value="modern" v-model="invoice_form.template"> <input type="radio" name="template" value="modern" v-model="invoice_form.template">

2
resources/views/partials/admin/menu.blade.php
View File

@ -6,7 +6,7 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="avatar avatar-xs background-unset"> <span class="avatar avatar-xs background-unset">
<img class="border-radius-0 border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}"> <img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}">
</span> </span>
<span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span> <span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
<i class="fas fa-sort-down pl-2"></i> <i class="fas fa-sort-down pl-2"></i>

2
resources/views/partials/modules/item.blade.php
View File

@ -19,7 +19,7 @@
<a href="{{ route('apps.app.show', [$module->slug]) }}"> <a href="{{ route('apps.app.show', [$module->slug]) }}">
@foreach ($module->files as $file) @foreach ($module->files as $file)
@if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail')) @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
<img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-0"> <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-none">
@endif @endif
@endforeach @endforeach
</a> </a>

2
resources/views/partials/portal/menu.blade.php
View File

@ -6,7 +6,7 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="avatar avatar-xs background-unset"> <span class="avatar avatar-xs background-unset">
<img class="border-radius-0 border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}"> <img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}">
</span> </span>
<span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span> <span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
</a> </a>

2
resources/views/sales/invoices/print_classic.blade.php
View File

@ -120,7 +120,7 @@
@foreach ($invoice->totals as $total) @foreach ($invoice->totals as $total)
@if ($total->code == 'total') @if ($total->code == 'total')
<p class="bg-light border-radius-5 float-right text-center w-50"> <p class="bg-light border-radius-default float-right text-center w-50">
<b>{{ trans($total->name) }}:</b> <b>{{ trans($total->name) }}:</b>
@money($total->amount - $invoice->paid, $invoice->currency_code, true) @money($total->amount - $invoice->paid, $invoice->currency_code, true)
</p> </p>

54
resources/views/settings/email/edit.blade.php
View File

@ -29,10 +29,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_new_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_new_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_new_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_new_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_new_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_new_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -54,10 +56,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_remind_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_remind_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_remind_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_remind_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -79,10 +83,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -104,10 +110,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_recur_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_recur_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_recur_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_recur_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -129,10 +137,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -154,10 +164,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_payment_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_payment_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_payment_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_payment_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -179,10 +191,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_invoice_payment_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_invoice_payment_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_payment_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_invoice_payment_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -204,10 +218,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_bill_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_bill_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_bill_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_bill_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -229,10 +245,12 @@
<div class="row"> <div class="row">
{{ Form::textGroup('template_bill_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }} {{ Form::textGroup('template_bill_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textEditorGroup('template_bill_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }} {{ Form::textEditorGroup('template_bill_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
<div class="col-md-12"> <div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small> <div class="bg-secondary border-radius-default border-1 p-2">
<small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
</div>
</div> </div>
</div> </div>
</div> </div>