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

Merge pull request #2633 from brkcvn/master

Browse Source 
Dropdown text html structure changed
This commit is contained in:
Burak Civan 2022-09-21 09:59:31 +03:00 committed by GitHub
commit e2490b9e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/components/AkauntingContactCard.vue
View File

@ -6,8 +6,8 @@
<div class="w-full h-33 bg-white hover:bg-gray-100 rounded-lg border border-light-gray disabled:bg-gray-200 mt-1 text-purple font-medium" :class="[{'border-red': error}]"> <div class="w-full h-33 bg-white hover:bg-gray-100 rounded-lg border border-light-gray disabled:bg-gray-200 mt-1 text-purple font-medium" :class="[{'border-red': error}]">
<div class="text-black h-full"> <div class="text-black h-full">
<button type="button" class="w-full h-full flex flex-col items-center justify-center" @click="onContactList"> <button type="button" class="w-full h-full flex flex-col items-center justify-center" @click="onContactList">
<span class="material-icons-outlined text-7xl text-black-400">person_add</span> <span class="material-icons-outlined text-7xl text-black-400 pointer-events-none">person_add</span>
<span class="text-add-contact"> {{ addContactText }} </span> <span class="text-add-contact pointer-events-none"> {{ addContactText }} </span>
</button> </button>
</div> </div>
</div> </div>

2
resources/assets/js/views/wizard/Currencies.vue
View File

@ -227,7 +227,7 @@
<div v-if="currencies.length && ! new_datas" class="w-full border-b hover:bg-gray-100" style="height:53px;"> <div v-if="currencies.length && ! new_datas" class="w-full border-b hover:bg-gray-100" style="height:53px;">
<button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()"> <button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()">
<span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1">add</span> <span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1 pointer-events-none">add</span>
<span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">{{ translations.currencies.new_currency }}</span> <span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">{{ translations.currencies.new_currency }}</span>
</button> </button>
</div> </div>

2
resources/assets/js/views/wizard/Taxes.vue
View File

@ -101,7 +101,7 @@
<div v-if="taxes.length" class="w-full border-b hover:bg-gray-100" style="height:53px;"> <div v-if="taxes.length" class="w-full border-b hover:bg-gray-100" style="height:53px;">
<button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()"> <button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()">
<span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1">add</span> <span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1 pointer-events-none">add</span>
{{ translations.taxes.new_tax }} {{ translations.taxes.new_tax }}
</button> </button>
</div> </div>

24
resources/views/common/dashboards/show.blade.php
View File

@ -108,19 +108,19 @@
</x-slot> </x-slot>
@can('create-common-widgets') @can('create-common-widgets')
<x-button <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
type="button" <x-button
id="show-more-actions-add-widget" type="button"
class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" id="show-more-actions-add-widget"
override="class" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"
title="{{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}" override="class"
@click="onCreateWidget()" title="{{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}"
> @click="onCreateWidget()"
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"> >
{{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }} {{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}
</span> </x-button>
</x-button> </div>
<x-dropdown.divider /> <x-dropdown.divider />
@endcan @endcan

43
resources/views/components/delete-link.blade.php
View File

@ -1,26 +1,27 @@
<x-button <div class="{{ $class }}">
type="button" <x-button
class="{{ $class }}" type="button"
@click="onDeleteViaConfirmation('delete-{{ $modelTable }}-{{ $id }}')" class="{{ $textClass }}"
override="class" @click="onDeleteViaConfirmation('delete-{{ $modelTable }}-{{ $id }}')"
{{ $attributes }} override="class"
> {{ $attributes }}
<span class="{{ $textClass }}"> >
@if ($slot->isNotEmpty()) @if ($slot->isNotEmpty())
{!! $slot !!} {!! $slot !!}
@else @else
{!! $label !!} {!! $label !!}
@endif @endif
</span>
<x-form.input.hidden
<x-form.input.hidden name="delete-{{ $modelTable }}-{{ $id }}"
name="delete-{{ $modelTable }}-{{ $id }}" id="delete-{{ $modelTable }}-{{ $id }}"
id="delete-{{ $modelTable }}-{{ $id }}" data-field="delete"
data-field="delete" data-action="{{ $action }}"
data-action="{{ $action }}" data-title="{!! $title !!}"
data-title="{!! $title !!}" data-message="{!! $message !!}"
data-message="{!! $message !!}" data-cancel="{!! $cancelText !!}"
data-cancel="{!! $cancelText !!}" data-delete="{!! $deleteText !!}"
data-delete="{!! $deleteText !!}" />
/> </x-button>
</x-button> </div>

8
resources/views/components/dropdown/button.blade.php
View File

@ -1,5 +1,5 @@
<button type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}> <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}>
<span class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100"> <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100">
{!! $slot !!} {!! $slot !!}
</span> </button>
</button> </div>

8
resources/views/components/dropdown/link.blade.php
View File

@ -1,5 +1,5 @@
<a href="{!! $href !!}" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}> <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}>
<span class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100"> <a href="{!! $href !!}" class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100">
{!! $slot !!} {!! $slot !!}
</span> </a>
</a> </div>

16
resources/views/components/table/actions.blade.php
View File

@ -91,11 +91,11 @@
@case('button') @case('button')
@php $divider = false; @endphp @php $divider = false; @endphp
<button type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}> <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}>
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"> <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
{{ $action['title'] }} {{ $action['title'] }}
</span> </button>
</button> </div>
@break @break
@case('delete') @case('delete')
@ -121,11 +121,11 @@
@default @default
@php $divider = false; @endphp @php $divider = false; @endphp
<a href="{{ $action['url'] }}" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}> <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}>
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"> <a href="{{ $action['url'] }}" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
{{ $action['title'] }} {{ $action['title'] }}
</span> </a>
</a> </div>
@endswitch @endswitch
@endforeach @endforeach
</div> </div>

6
resources/views/components/transactions/show/more-buttons.blade.php
View File

@ -25,14 +25,16 @@
@if ($transaction->is_splittable && empty($transaction->document_id) && empty($transaction->recurring) && $transaction->isNotTransferTransaction()) @if ($transaction->is_splittable && empty($transaction->document_id) && empty($transaction->recurring) && $transaction->isNotTransferTransaction())
@if (! $hideButtonConnect) @if (! $hideButtonConnect)
@can($permissionCreate) @can($permissionCreate)
<div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
<button <button
type="button" type="button"
id="show-more-actions-connect-{{ $transaction->type }}" id="show-more-actions-connect-{{ $transaction->type }}"
class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"
title="{{ trans('general.connect') }}" title="{{ trans('general.connect') }}"
@click="onConnectTransactions('{{ route('transactions.dial', $transaction->id) }}')"> @click="onConnectTransactions('{{ route('transactions.dial', $transaction->id) }}')">
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">{{ trans('general.connect') }}</span> {{ trans('general.connect') }}
</button> </button>
</div>
@endcan @endcan
@endif @endif
@endif @endif

8
resources/views/components/transfers/show/more-buttons.blade.php
View File

@ -45,11 +45,11 @@
@stack('choose_button_start') @stack('choose_button_start')
<button type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" @click="onTemplate"> <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"> <button type="button" @click="onTemplate" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
{{ trans('general.form.choose', ['field' => trans_choice('general.templates', 1)]) }} {{ trans('general.form.choose', ['field' => trans_choice('general.templates', 1)]) }}
</span> </button>
</button> </div>
@stack('choose_button_end') @stack('choose_button_end')

22
resources/views/components/widgets/header.blade.php
View File

@ -22,18 +22,18 @@
</x-slot> </x-slot>
@can('update-common-widgets') @can('update-common-widgets')
<x-button <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
type="button" <x-button
id="show-more-actions-edit-widget-{{ $class->model->id }}" type="button"
class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" id="show-more-actions-edit-widget-{{ $class->model->id }}"
override="class" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"
title="{{ trans('general.edit') }}" override="class"
@click="onEditWidget('{{ $class->model->id }}')" title="{{ trans('general.edit') }}"
> @click="onEditWidget('{{ $class->model->id }}')"
<span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"> >
{{ trans('general.edit') }} {{ trans('general.edit') }}
</span> </x-button>
</x-button> </div>
@endcan @endcan
@can('delete-common-widgets') @can('delete-common-widgets')