Skip to content

Commit a6a6b05

Browse files
committed
Merge branch 'master' into development
2 parents 7748021 + 29873a0 commit a6a6b05

File tree

2 files changed

+31
-25
lines changed

2 files changed

+31
-25
lines changed
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +0,0 @@
1-
@aware(['isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
2-
@if ($isTailwind)
3-
<button
4-
wire:click.prevent="setFilterDefaults"
5-
@class([
6-
"focus:outline-none active:outline-none"
7-
])>
8-
<span @class([
9-
"inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium",
10-
"bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900"
11-
])>
12-
{{ __('livewire-tables::core.Clear') }}
13-
</span>
14-
</button>
15-
@else
16-
<a
17-
href="#"
18-
wire:click.prevent="setFilterDefaults"
19-
@class([
20-
'badge badge-pill badge-light' => $isBootstrap4,
21-
'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
22-
])>
23-
{{ __('livewire-tables::core.Clear') }}
24-
</a>
25-
@endif

resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
22
@props(['filterKey'])
3+
@if ($isTailwind)
4+
<button
5+
wire:click="resetFilter('{{ $filterKey }}')"
6+
type="button"
7+
@class([
8+
"flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none",
9+
"text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white",
10+
])
11+
>
12+
<span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
13+
<x-heroicon-m-x-mark class="h-full" />
14+
</button>
15+
@else
16+
<a
17+
href="#"
18+
wire:click="resetFilter('{{ $filterKey }}')"
19+
@class([
20+
'text-white ml-2' => ($isBootstrap),
21+
])
22+
>
23+
<span @class([
24+
'sr-only' => $isBootstrap4,
25+
'visually-hidden' => $isBootstrap5,
26+
])>
27+
@lang('livewire-tables::Remove filter option')
28+
</span>
29+
<x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny" />
30+
</a>
31+
@endif
32+
@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
33+
@props(['filterKey'])
334
@if ($isTailwind)
435
<button
536
wire:click="resetFilter('{{ $filterKey }}')"

0 commit comments

Comments
 (0)