Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: RichEditor spacing when no buttons #2529

Merged
merged 6 commits into from May 26, 2022
Merged

Fix: RichEditor spacing when no buttons #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d79d9d
Count the buttons and conditionally apply class
johncarter- May 24, 2022
e581770
Errr, hidden...
johncarter- May 24, 2022
acaa4e2
Use class blade directive
johncarter- May 24, 2022
fd28914
Use the proper classes
johncarter- May 24, 2022
dcde501
Just wrap the toolbar in an @if instead
johncarter- May 24, 2022
1585d02
wip
danharrin May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/forms/resources/views/component-container.blade.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<div @class([
'grid gap-6 filament-forms-component-container',
'grid-cols-1' => $getColumns('default') === 1,
'grid-cols-1' => (! $getColumns('default')) || $getColumns('default') === 1,
'grid-cols-2' => $getColumns('default') === 2,
'grid-cols-3' => $getColumns('default') === 3,
'grid-cols-4' => $getColumns('default') === 4,
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/resources/views/components/checkbox-list.blade.php
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
>
<div @class([
'grid gap-1 filament-forms-checkbox-list-component',
'grid-cols-1' => $getColumns('default') === 1,
'grid-cols-1' => (! $getColumns('default')) || $getColumns('default') === 1,
'grid-cols-2' => $getColumns('default') === 2,
'grid-cols-3' => $getColumns('default') === 3,
'grid-cols-4' => $getColumns('default') === 4,
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/resources/views/components/radio.blade.php
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
'filament-forms-radio-component',
'flex flex-wrap gap-3' => $isInline(),
'grid gap-2' => ! $isInline(),
'grid-cols-1' => $getColumns('default') === 1,
'grid-cols-1' => (! $getColumns('default')) || $getColumns('default') === 1,
'grid-cols-2' => $getColumns('default') === 2,
'grid-cols-3' => $getColumns('default') === 3,
'grid-cols-4' => $getColumns('default') === 4,
Expand Down
7 changes: 6 additions & 1 deletion packages/forms/resources/views/components/rich-editor.blade.php
View file
Open in desktop
Expand Up @@ -39,7 +39,12 @@
@unless ($isDisabled())
<input id="trix-value-{{ $getId() }}" type="hidden" />

<trix-toolbar id="trix-toolbar-{{ $getId() }}">
<trix-toolbar
id="trix-toolbar-{{ $getId() }}"
@class([
'hidden' => ! count($getToolbarButtons()),
])
>
<div class="flex justify-between space-x-4 rtl:space-x-reverse overflow-x-auto items-stretch overflow-y-hidden">
<div class="flex items-stretch space-x-4 rtl:space-x-reverse focus:outline-none">
@if ($hasToolbarButton(['bold', 'italic', 'strike', 'link']))
Expand Down