Skip to content

Commit 1e94332

Browse files
lrljoelrljoe
committed
PushFixes
1 parent 081279e commit 1e94332

26 files changed

+455
-119
lines changed

‎resources/views/components/actions/actions.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div {{ $attributes
2929
->merge($actionWrapperAttributes)
3030
->class([
31-
'flex flex-cols py-2 space-x-2' => $isTailwind && ($actionWrapperAttributes['default-styling'] ?? true),
31+
'h-full flex flex-cols space-x-2' => $isTailwind && ($actionWrapperAttributes['default-styling'] ?? true),
3232
'' => $isTailwind && ($actionWrapperAttributes['default-colors'] ?? true),
3333
'tw4ph flex flex-cols py-2 space-x-2' => $isTailwind4 && ($actionWrapperAttributes['default-styling'] ?? true),
3434
'tw4ph ' => $isTailwind4 && ($actionWrapperAttributes['default-colors'] ?? true),

‎resources/views/components/dropdown/link/icon.blade.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@aware(['tableName','isBootstrap', 'isTailwind', 'isTailwind4'])
2+
@props(['icon', 'iconRight' => false])
3+
<span @class([
4+
'w-1/12',
5+
'order-1 inline-block ' => !$iconRight,
6+
'order-2 inline-block mr-2' => $iconRight
7+
])>
8+
<i {{ $attributes
9+
->class([
10+
'ms-1 '. $icon => $isBootstrap,
11+
'ml-1 '. $icon => $isTailwind && $iconRight,
12+
'pr-1 '. $icon => $isTailwind && !$iconRight,
13+
])
14+
->except(['default','default-styling','default-colors'])
15+
}}
16+
></i>
17+
</span>

‎resources/views/components/dropdown/link/label.blade.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@aware(['tableName','isBootstrap', 'isTailwind', 'isTailwind4'])
2+
@props(['icon', 'hasIcon' => false, 'iconRight' => false])
3+
<span {{ $attributes->merge()->class([
4+
'w-11/12 ',
5+
'order-1' => $hasIcon && $iconRight,
6+
'order-2' => $hasIcon && !$iconRight,
7+
])
8+
}}>
9+
{{ $slot }}
10+
</span>

‎resources/views/components/forms/button.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
->class([
77
'btn dropdown-toggle d-block d-md-inline' => $isBootstrap && ($attributes['default-styling'] ?? true),
88
'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $isTailwind && ($attributes['default-colors'] ?? true),
9-
'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
9+
'h-full content-center items-center inline-flex content-center justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
1010
'tw4ph border-gray-300 bg-white text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600' => $isTailwind4 && ($attributes['default-colors'] ?? true),
1111
'tw4ph inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind4 && ($attributes['default-styling'] ?? true),
1212
])

‎resources/views/components/shared/button-icon.blade.php‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
@aware(['tableName','isBootstrap', 'isTailwind', 'isTailwind4'])
2+
@props(['icon' => '', 'iconRight' => false, 'label' => null, 'title' => null])
3+
@if($isTailwind || $isTailwind4)
4+
<button {{
5+
$attributes
6+
->class([
7+
'text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:focus:text-white dark:focus:bg-gray-600 dark:hover:bg-gray-600' => $isTailwind && ($attributes['default-colors'] ?? true),
8+
'flex flex-cols w-full px-4 py-2 text-sm focus:outline-none items-left text-left gap-2' => $isTailwind && ($attributes['default-styling'] ?? true),
9+
'twp4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900 dark:text-white dark:hover:bg-gray-600' => $isTailwind4 && ($attributes['default-colors'] ?? true),
10+
'twp4 block w-full px-4 py-2 text-sm leading-5 focus:outline-none flex items-center space-x-2' => $isTailwind4 && ($attributes['default-styling'] ?? true),
11+
])
12+
->except(['default-colors','default-styling'])
13+
}}>
14+
@if($icon !== '')
15+
<span @class([
16+
'w-1/12',
17+
'order-1' => !$iconRight,
18+
'order-2' => $iconRight
19+
])><i class="{{ $icon }}"></i></span>
20+
@endif
21+
<span @class([
22+
'w-11/12 ',
23+
'order-2' => $icon !== '' && !$iconRight,
24+
'order-1' => $icon !== '' && $iconRight
25+
])>{{ $label ?? ($title ?? '') }}</span>
26+
27+
</button>
28+
@else
29+
<a {{
30+
$attributes->merge([
31+
'href' => '#',
32+
])
33+
->class([
34+
'dropdown-item' => ($attributes['default-styling'] ?? true),
35+
])
36+
->except(['default-colors','default-styling'])
37+
}}>
38+
@if($icon !== '' && !$iconRight)
39+
<span><i class="{{ $icon }}"></i></span>
40+
@endif
41+
<span>{{ $label ?? ($title ?? '') }}</span>
42+
@if($icon !== '' && $iconRight)
43+
<span><i class="{{ $icon }}"></i></span>
44+
@endif
45+
46+
</a>
47+
@endif

‎resources/views/components/shared/button.blade.php‎

Whitespace-only changes.

‎resources/views/components/shared/link.blade.php‎

Whitespace-only changes.

‎resources/views/components/tools/toolbar/items/bulk-actions.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
])
99
>
1010
<div @class([
11-
'relative inline-block text-left z-10 w-full md:w-auto' => $isTailwind,
11+
'flex-1 content-center items-center justify-center relative inline-block text-left z-10 w-full md:w-auto' => $isTailwind,
1212
'tw4ph relative inline-block text-left z-10 w-full md:w-auto' => $isTailwind4,
1313
'dropdown d-block d-md-inline' => $isBootstrap,
1414
])

‎resources/views/components/tools/toolbar/toolbar.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<div {{
55
$attributes->merge($this->getToolBarAttributes)
66
->class([
7-
'md:flex md:justify-between mb-4 px-4 md:p-0' => (($isTailwind) && ($this->getToolBarAttributes['default-styling'] ?? true)),
7+
'md:flex md:justify-between mb-2 px-4 md:p-0' => (($isTailwind) && ($this->getToolBarAttributes['default-styling'] ?? true)),
88
'd-md-flex justify-content-between mb-3' => (($isBootstrap) && ($this->getToolBarAttributes['default-styling'] ?? true)),
99
])
1010
->except(['default','default-styling','default-colors'])
1111
}}
1212
>
1313
<div @class([
1414
'd-md-flex' => ($isBootstrap),
15-
'w-full mb-4 md:mb-0 md:w-2/4 md:flex space-y-4 md:space-y-0 md:space-x-2' => ($isTailwind),
15+
'w-full mb-2 md:mb-0 md:w-2/4 md:flex space-y-4 md:space-y-0 md:space-x-2' => ($isTailwind),
1616
])
1717
>
1818
@if ($this->hasConfigurableAreaFor('toolbar-left-start'))
@@ -53,20 +53,20 @@
5353
<div x-cloak x-show="!currentlyReorderingStatus"
5454
@class([
5555
'd-md-flex' => ($isBootstrap),
56-
'md:flex md:items-center space-y-4 md:space-y-0 md:space-x-2' => ($isTailwind),
56+
'md:flex md:items-center space-y-4 md:space-y-0 md:space-x-2 h-full content-center items-center justify-center' => ($isTailwind),
5757
])
5858
>
5959
@includeWhen($this->hasConfigurableAreaFor('toolbar-right-start'), $this->getConfigurableAreaFor('toolbar-right-start'), $this->getParametersForConfigurableArea('toolbar-right-start'))
6060

6161

62-
@if ($this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption != true)
63-
<x-livewire-tables::tools.toolbar.items.bulk-actions />
64-
@endif
65-
6662
@if($this->showActionsInToolbarRight())
6763
<x-livewire-tables::actions />
6864
@endif
6965

66+
@if ($this->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption != true)
67+
<x-livewire-tables::tools.toolbar.items.bulk-actions />
68+
@endif
69+
7070
@if ($this->columnSelectIsEnabled())
7171
<x-livewire-tables::tools.toolbar.items.column-select />
7272
@endif

‎resources/views/includes/actions/button.blade.php‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1+
@aware(['tableName','isBootstrap', 'isTailwind', 'isTailwind4'])
12
<a {{ $attributes->merge()
23
->class([
34
'w-full text-left' => $isTailwind && $isInMenu,
45
'text-center' => $isTailwind && !$isInMenu,
5-
'justify-center items-center inline-flex flex-cols gap-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
6+
'justify-center items-center inline-flex flex-cols gap-2 rounded-md border shadow-sm px-2 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && ($attributes['default-styling'] ?? true),
67
'focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && ($attributes['default-colors'] ?? true),
78
'btn btn-sm btn-success' => $isBootstrap && ($attributes['default-styling'] ?? true),
89
'' => $isBootstrap && ($attributes['default-colors'] ?? true),
910
])
1011
->except(['default','default-styling','default-colors'])
1112
}}
12-
@if($action->hasWireAction())
13-
{{ $action->getWireAction() }}="{{ $action->getWireActionParams() }}"
13+
@if($action->hasIcon())
14+
<span @class([
15+
'w-1/12',
16+
'order-1 inline-block ' => !$action->getIconRight(),
17+
'order-2 inline-block mr-2' => $action->getIconRight()
18+
])>
19+
<i {{ $action->getIconAttributes()
20+
->class([
21+
'ms-1 '. $action->getIcon() => $isBootstrap,
22+
'ml-1 '. $action->getIcon() => $isTailwind && $action->getIconRight(),
23+
'pr-1 '. $action->getIcon() => $isTailwind && !$action->getIconRight(),
24+
])
25+
->except(['default','default-styling','default-colors'])
26+
}}
27+
></i>
28+
</span>
1429
@endif
15-
@if($action->getWireNavigateEnabled())
16-
wire:navigate
17-
@endif
18-
>
19-
@if($action->hasIcon())
20-
<span @class([
21-
'w-1/12',
22-
'order-1 inline-block ' => !$action->getIconRight(),
23-
'order-2 inline-block mr-2' => $action->getIconRight()
24-
])>
25-
<i {{ $action->getIconAttributes()
26-
->class([
27-
'ms-1 '. $action->getIcon() => $isBootstrap,
28-
'ml-1 '. $action->getIcon() => $isTailwind && $action->getIconRight(),
29-
'pr-1 '. $action->getIcon() => $isTailwind && !$action->getIconRight(),
30-
])
31-
->except(['default','default-styling','default-colors'])
32-
}}
33-
></i>
30+
<span {{ $action->getLabelAttributesBag()->merge()->class([
31+
'w-11/12 ',
32+
'order-1' => $action->hasIcon() && $action->getIconRight(),
33+
'order-2' => $action->hasIcon() && !$action->getIconRight(),
34+
]) }}>
35+
{{ $action->getLabel() }}
3436
</span>
35-
@endif
36-
<span {{ $action->getLabelAttributesBag()->merge()->class([
37-
'w-11/12 ',
38-
'order-1' => $action->hasIcon() && $action->getIconRight(),
39-
'order-2' => $action->hasIcon() && !$action->getIconRight(),
40-
]) }}>
41-
{{ $action->getLabel() }}
42-
</span>
4337
</a>

0 commit comments

Comments
 (0)