diff --git a/app/View/Components/DeleteLink.php b/app/View/Components/DeleteLink.php index 52c9cdee7..f098768eb 100644 --- a/app/View/Components/DeleteLink.php +++ b/app/View/Components/DeleteLink.php @@ -282,7 +282,7 @@ class DeleteLink extends Component protected function getClass($class) { - $default_class = 'w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap'; + $default_class = 'w-full flex items-center text-red sm:text-purple px-2 h-9 leading-9 whitespace-nowrap'; $explode = explode(',', $this->override); diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index 7a7e06de8..f608d6058 100644 --- a/public/akaunting-js/generalAction.js +++ b/public/akaunting-js/generalAction.js @@ -28,7 +28,12 @@ document.querySelectorAll("[data-table-body]").forEach((table) => { for (let i = first_selector; i < td.length - 1; i++) { let td_item = td[i]; - td_item.addEventListener("click", () => { + td_item.addEventListener("click", (event) => { + // click disabled when preview dialog is open + if (event.target.closest('[data-tooltip-target]')) { + return; + } + // click disabled when preview dialog is open window.location.href = row_href; }); diff --git a/public/css/app.css b/public/css/app.css index a2837b0a6..63164f7b4 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -57052,6 +57052,11 @@ body{ line-height: 2.75rem; } + .sm\:text-purple{ + --tw-text-opacity: 1; + color: rgb(85 88 139 / var(--tw-text-opacity)); + } + [dir="ltr"] .sm\:ltr\:right-4{ right: 1rem; } diff --git a/resources/views/components/delete-button.blade.php b/resources/views/components/delete-button.blade.php index e7e3333b7..6197ddb5e 100644 --- a/resources/views/components/delete-button.blade.php +++ b/resources/views/components/delete-button.blade.php @@ -1,28 +1,55 @@ - - @if ($slot->isNotEmpty()) - {!! $slot !!} - @else - delete - - @endif +@mobile + + @if ($slot->isNotEmpty()) + {!! $slot !!} + @else + {!! $label !!} + @endif - - + + +@else + + @if ($slot->isNotEmpty()) + {!! $slot !!} + @else + delete + + @endif + + + +@endmobile diff --git a/resources/views/components/table/actions-mobile.blade.php b/resources/views/components/table/actions-mobile.blade.php new file mode 100644 index 000000000..e0a311ddc --- /dev/null +++ b/resources/views/components/table/actions-mobile.blade.php @@ -0,0 +1,134 @@ +@php + $count_buttons = 1; + $more_actions = []; +@endphp + +
+ + more_horiz + +
+ + \ No newline at end of file diff --git a/resources/views/components/table/actions.blade.php b/resources/views/components/table/actions.blade.php index d2e273600..639303fc4 100644 --- a/resources/views/components/table/actions.blade.php +++ b/resources/views/components/table/actions.blade.php @@ -4,264 +4,135 @@ @endphp @mobile -
- - arrow_drop_up - -
+ +@else +