Merge pull request #1098 from batuhawk/master

Wizard save button style updated
This commit is contained in:
Batuhan Baş 2020-01-09 12:15:43 +03:00 committed by GitHub
commit 84554e3f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 37 deletions

View File

@ -15,11 +15,13 @@
'class' => 'form-loading-button mb-0',
'novalidate' => true
]) !!}
<div id="wizard-loading"></div>
<div class="card-header wizard-header pb-0">
<div class="container-fluid">
<div class="row">
<hr class="wizard-line">
<div class="col-md-3">
<div class="text-center">
<button href="#step-1" type="button" class="btn btn-default btn-lg wizard-steps rounded-circle">
@ -82,9 +84,7 @@
], [])) !!}
</div>
<div class="invalid-feedback d-block"
v-if="form.errors.has('api_key')"
v-html="form.errors.get('api_key')"></div>
<div class="invalid-feedback d-block" v-if="form.errors.has('api_key')" v-html="form.errors.get('api_key')"></div>
</div>
<p class="mb-0 mt--3">
<small>{!! trans('modules.get_api_key', ['url' => 'https://akaunting.com/dashboard']) !!}</small>
@ -109,7 +109,9 @@
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
<a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-white header-button-top"><span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}</a>
<a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-white header-button-top">
<span class="fa fa-share"></span> &nbsp;{{ trans('general.skip') }}
</a>
</div>
</div>
</div>

View File

@ -8,6 +8,7 @@
<div class="container-fluid">
<div class="row">
<hr class="wizard-line">
<div class="col-md-3">
<div class="text-center">
<a href="{{ url('wizard/companies') }}">
@ -52,7 +53,7 @@
<div class="card-body border-bottom-0">
<div class="row">
<div class="col-12 text-right">
<span class="new-button">
<span>
<button type="button" @click="onAddCurrency" class="btn btn-success btn-sm">
<span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}
</button>
@ -137,12 +138,11 @@
</td>
<td class="col-xs-4 col-sm-2 text-center">
{!! Form::button(
'<div v-if="form.loading" :class="(form.loading) ? \'show \' : \'\'" class="aka-loader-frame d-none"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>', [
'<span class="btn-inner--icon"><i class="fas fa-save"></i></span>', [
':disabled' => 'form.loading',
'type' => 'submit',
'class' => 'btn btn-success currency-submit',
'class' => 'btn btn-success',
'data-loading-text' => trans('general.loading'),
'style' => 'padding: 9px 14px; margin-top: 10px;'
]) !!}
<div class="d-none">

View File

@ -8,6 +8,7 @@
<div class="container-fluid">
<div class="row">
<hr class="wizard-line">
<div class="col-md-3">
<div class="text-center">
<a href="{{ url('wizard/companies') }}">
@ -53,7 +54,7 @@
</div>
</div>
<div class="card-body bg-secondary">
<div class="card-body bg-default">
<div class="row">
<div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
<div class="content-header">
@ -97,7 +98,9 @@
<div class="card-footer">
<div class="row">
<div class="col-md-12 text-right">
<a href="{{ url('/') }}" class="btn btn-lg btn-success header-button-top"><span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}</a>
<a href="{{ url('/') }}" class="btn btn-lg btn-success header-button-top">
<span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}
</a>
</div>
</div>
</div>

View File

@ -8,6 +8,7 @@
<div class="container-fluid">
<div class="row">
<hr class="wizard-line">
<div class="col-md-3">
<div class="text-center">
<a href="{{ url('wizard/companies') }}">
@ -54,7 +55,7 @@
<div class="card-body border-bottom-0">
<div class="row">
<div class="col-12 text-right">
<span class="new-button">
<span>
<button type="button" @click="onAddTax" class="btn btn-success btn-sm">
<span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}
</button>
@ -134,12 +135,11 @@
</td>
<td class="col-xs-4 col-sm-3 text-center">
{!! Form::button(
'<div v-if="form.loading" :class="(form.loading) ? \'show \' : \'\'" class="aka-loader-frame d-none"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>', [
'<span class="btn-inner--icon"><i class="fas fa-save"></i></span>', [
':disabled' => 'form.loading',
'type' => 'submit',
'class' => 'btn btn-success tax-submit',
'class' => 'btn btn-success',
'data-loading-text' => trans('general.loading'),
'style' => 'padding: 9px 14px; margin-top: 10px;'
]) !!}
</td>
</tr>