Skip to content

Commit

Permalink
Merge branch '3.x' of https://github.com/filamentphp/filament into 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed May 30, 2024
2 parents 425750a + e401227 commit 6de3b9b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'mt-6' => ! $isContained,
]);
$inactiveTabClasses = 'invisible h-0 overflow-y-hidden p-0';
$inactiveTabClasses = 'absolute h-0 overflow-hidden p-0';
@endphp

<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'mt-6' => ! $isContained,
]);
$inactiveStepClasses = 'invisible h-0 overflow-y-hidden p-0';
$inactiveStepClasses = 'absolute h-0 overflow-hidden p-0';
@endphp

<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'mt-6' => ! $isContained,
]);
$inactiveTabClasses = 'invisible h-0 overflow-y-hidden p-0';
$inactiveTabClasses = 'absolute h-0 overflow-hidden p-0';
@endphp

<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@
<link rel="icon" href="{{ $favicon }}" />
@endif

@php
$title = strip_tags(($livewire ?? null)?->getTitle() ?? '');
$brandName = strip_tags(filament()->getBrandName());
@endphp

<title>
{{ filled($title = strip_tags(($livewire ?? null)?->getTitle() ?? '')) ? "{$title} - " : null }}
{{ strip_tags(filament()->getBrandName()) }}
{{ (filled($title) ? "{$title} - " : null) }} {{ $brandName }}
</title>

{{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::STYLES_BEFORE, scopes: $livewire->getRenderHookScopes()) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
@if ($collapsed || $persistCollapsed)
x-cloak
@endif
x-bind:class="{ 'invisible h-0 overflow-y-hidden border-none': isCollapsed }"
x-bind:class="{ 'absolute h-0 overflow-hidden border-none': isCollapsed }"
@endif
@class([
'fi-section-content-ctn',
Expand Down

0 comments on commit 6de3b9b

Please sign in to comment.