Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements
This commit is contained in:
@ -77,7 +77,7 @@
|
||||
|
||||
@stack('remove_th_start')
|
||||
|
||||
<th class="border-t-0 border-r-0 border-b-0" style="vertical-align:bottom;">
|
||||
<th class="border-t-0 border-r-0 border-b-0 align-bottom" style="width:24px; display:block;">
|
||||
<div></div>
|
||||
</th>
|
||||
|
||||
|
@ -22,20 +22,20 @@
|
||||
<div class="relative flex items-center ltr:mr-4 rtl:ml-4" v-if="bulk_action.count">
|
||||
@foreach ($actions as $key => $action)
|
||||
@if (! empty($action['icon']))
|
||||
<div>
|
||||
<x-tooltip id="{{ $key }}" placement="top" message="{{ trans($action['name']) }}">
|
||||
<x-button @click="onChangeBulkAction('{{ $key }}')"
|
||||
id="button-bulk-action-{{ $key }}"
|
||||
class="relative w-8 h-8 flex items-center px-2 mr-2 rounded-lg hover:bg-gray-200"
|
||||
override="class"
|
||||
data-message="{{ ! empty($action['message']) ? trans_choice($action['message'], 2, ['type' => strtolower(trans_choice($text, 2))]) : '' }}"
|
||||
data-path="{{ (isset($path) && ! empty($path)) ? $path : '' }}"
|
||||
data-type="{{ (isset($action['type']) && ! empty($action['type'])) ? $action['type'] : '' }}"
|
||||
>
|
||||
<x-icon class="text-lg" :icon="$action['icon']" />
|
||||
</x-button>
|
||||
</x-tooltip>
|
||||
</div>
|
||||
<div>
|
||||
<x-tooltip id="{{ $key }}" placement="top" message="{{ trans($action['name']) }}">
|
||||
<x-button @click="onChangeBulkAction('{{ $key }}')"
|
||||
id="button-bulk-action-{{ $key }}"
|
||||
class="relative w-8 h-8 flex items-center px-2 mr-2 rounded-lg hover:bg-gray-200"
|
||||
override="class"
|
||||
data-message="{{ ! empty($action['message']) ? trans_choice($action['message'], 2, ['type' => strtolower(trans_choice($text, 2))]) : '' }}"
|
||||
data-path="{{ (isset($path) && ! empty($path)) ? $path : '' }}"
|
||||
data-type="{{ (isset($action['type']) && ! empty($action['type'])) ? $action['type'] : '' }}"
|
||||
>
|
||||
<x-icon class="text-lg" :icon="$action['icon']" />
|
||||
</x-button>
|
||||
</x-tooltip>
|
||||
</div>
|
||||
@else
|
||||
<div>
|
||||
<x-tooltip id="{{ $key }}" placement="top" message="{{ trans($action['name']) }}">
|
||||
|
@ -12,7 +12,7 @@
|
||||
textButton="{{ trans('general.confirm') }}"
|
||||
textCard="{{ trans_choice('general.card.cards', 2) }}"
|
||||
textNewCard="{{ trans('general.form.add_new', ['field' => trans_choice('general.card.cards', 1)]) }}"
|
||||
textStoreCard="{{ trans('general.card.save') }} "
|
||||
textStoreCard="{{ trans('general.card.save') }}"
|
||||
:store-card="{{ !empty($store_card) ? 'true' : 'false' }}"
|
||||
:cards="{{ !empty($cards) ? json_encode($cards) : json_encode([]) }}"
|
||||
:form-data="formData"
|
||||
|
@ -8,6 +8,7 @@
|
||||
data-id="tab-{{ $id }}"
|
||||
data-tabs="{{ $id }}"
|
||||
x-bind:class="active != '{{ $id }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
|
||||
{{ $attributes }}
|
||||
>
|
||||
@if ($slot->isNotEmpty())
|
||||
{!! $slot !!}
|
||||
|
@ -9,6 +9,7 @@
|
||||
data-tabs="{{ $id }}"
|
||||
x-on:click="active = '{{ $id }}'"
|
||||
x-bind:class="active != '{{ $id }}' ? '' : 'active-tabs text-purple border-purple transition-all after:absolute after:w-full after:h-0.5 after:left-0 after:right-0 after:bottom-0 after:bg-purple after:rounded-tl-md after:rounded-tr-md'"
|
||||
{{ $attributes }}
|
||||
>
|
||||
@if ($slot->isNotEmpty())
|
||||
{!! $slot !!}
|
||||
|
@ -1,5 +1,10 @@
|
||||
@props(['id'])
|
||||
|
||||
<div id="tab-{{ $id }}" data-tabs-content="{{ $id }}" x-show="active === '{{ $id }}'">
|
||||
<div
|
||||
id="tab-{{ $id }}"
|
||||
data-tabs-content="{{ $id }}"
|
||||
x-show="active === '{{ $id }}'"
|
||||
{{ $attributes }}
|
||||
>
|
||||
{{ $slot }}
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user