Skip to content

[4.x] Fix stacked grid margin-top styling #9733

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

Merged
jasonvarga merged 2 commits into from
Mar 14, 2024
Merged

[4.x] Fix stacked grid margin-top styling #9733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0a6424
If you take 🔪 decide to hide display label, hide this too.
jesseleite Mar 14, 2024
5b3d54e
Fix margin issues (see PR screenshots for edge cases).
jesseleite Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions resources/js/components/fieldtypes/grid/Stacked.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
<div
class="grid-stacked"
:class="{
'mt-12': !grid.fullScreenMode && hideDisplay,
'mt-6': !grid.fullScreenMode && !hideDisplay,
'mt-0': !allowFullscreen && hideDisplay,
'mt-4': !hideDisplay,
'mt-10': allowFullscreen,
}"
slot-scope="{}"
>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/publish/Field.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
v-text="__(labelText)"
v-tooltip="{content: config.handle, delay: 500, autoHide: false}"
/>
<i class="required rtl:ml-1 ltr:mr-1" v-if="config.required">*</i>
<i class="required rtl:ml-1 ltr:mr-1" v-if="showLabelText && config.required">*</i>
<avatar v-if="isLocked" :user="lockingUser" class="w-4 rounded-full -mt-px rtl:mr-2 ltr:ml-2 rtl:ml-2 ltr:mr-2" v-tooltip="lockingUser.name" />
<span v-if="isReadOnly && !isTab && !isSection" class="text-gray-500 font-normal text-2xs rtl:ml-1 ltr:mr-1">
{{ isLocked ? __('Locked') : __('Read Only') }}
Expand Down