Skip to content

[6.x] Fixes UI inconsistencies #13505

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

Open
kjetilhole wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[6.x] Fixes UI inconsistencies #13505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ff2b4
Make header span background color span across entire width
kjetilhole Jan 11, 2026
5871b58
Remove 'Field' from fieldtype titles
kjetilhole Jan 11, 2026
3cb7b7c
Fix position of close button when clicking copy url in assets
kjetilhole Jan 11, 2026
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
102 changes: 53 additions & 49 deletions resources/js/components/fields/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
<template>
<div class="h-full overflow-auto bg-content-bg dark:bg-dark-content-bg focus-none p-3 pt-0">
<div class="h-full overflow-auto bg-content-bg dark:bg-dark-content-bg focus-none pt-0">
<div v-if="loading" class="absolute inset-0 z-200 flex items-center justify-center text-center">
<Icon name="loading" />
</div>

<header v-if="!loading" class="flex flex-wrap items-center justify-between pl-3 pt-3 pb-4 -mb-4 sticky top-0 z-(--z-index-modal) bg-gradient-to-b from-white from-75% dark:from-gray-800">
<Heading :text=" __(fieldtype.title + ' ' + 'Field')" size="lg" :icon="fieldtype.icon" />
<div class="flex items-center gap-3">
<Button variant="ghost" :text="__('Cancel')" @click.prevent="close" />
<Button variant="default" @click.prevent="commit" :text="__('Apply')" />
<Button v-if="!(isNestedField)" variant="primary" @click.prevent="commitAndSave" icon="save" :text="__('Apply & Save')" />
<Button v-if="isNestedField" variant="default" @click.prevent="commitAndCloseAll" :text="__('Apply & Close All')" />
<Button v-if="isNestedField" variant="primary" @click.prevent="commitAndSaveAll" icon="save" :text="__('Save & Close All')" />
<header v-if="!loading" class="px-3 sticky top-0 z-(--z-index-modal) bg-gradient-to-b from-white from-75% dark:from-gray-800">
<div class="flex flex-wrap items-center justify-between pl-3 pt-3 pb-4 -mb-4">
<Heading :text=" __(fieldtype.title)" size="lg" :icon="fieldtype.icon" />
<div class="flex items-center gap-3">
<Button variant="ghost" :text="__('Cancel')" @click.prevent="close" />
<Button variant="default" @click.prevent="commit" :text="__('Apply')" />
<Button v-if="!(isNestedField)" variant="primary" @click.prevent="commitAndSave" icon="save" :text="__('Apply & Save')" />
<Button v-if="isNestedField" variant="default" @click.prevent="commitAndCloseAll" :text="__('Apply & Close All')" />
<Button v-if="isNestedField" variant="primary" @click.prevent="commitAndSaveAll" icon="save" :text="__('Save & Close All')" />
</div>
</div>
</header>

<section v-if="!loading" class="isolate lg:px-3 py-4">
<Tabs v-model:modelValue="activeTab">
<TabList class="mb-6">
<TabTrigger name="settings" :text="__('Settings')" />
<TabTrigger name="conditions" :text="__('Conditions')" />
<TabTrigger name="validation" :text="__('Validation')" />
</TabList>

<div>
<TabContent name="settings">
<ui-publish-container
ref="container"
:blueprint="adjustedBlueprint"
:meta="meta"
:errors="errors"
v-model="values"
v-model:modified-fields="editedFields"
:origin-values="originValues"
:origin-meta="originMeta"
as-config
/>
</TabContent>

<TabContent name="conditions">
<CardPanel :heading="__('Conditions')">
<FieldConditionsBuilder
:config="values"
:suggestable-fields="suggestableConditionFields"
@updated="updateFieldConditions"
@updated-always-save="updateAlwaysSave"
<section v-if="!loading" class="p-3 pt-0">
<div class="isolate lg:px-3 py-4">
<Tabs v-model:modelValue="activeTab">
<TabList class="mb-6">
<TabTrigger name="settings" :text="__('Settings')" />
<TabTrigger name="conditions" :text="__('Conditions')" />
<TabTrigger name="validation" :text="__('Validation')" />
</TabList>

<div>
<TabContent name="settings">
<ui-publish-container
ref="container"
:blueprint="adjustedBlueprint"
:meta="meta"
:errors="errors"
v-model="values"
v-model:modified-fields="editedFields"
:origin-values="originValues"
:origin-meta="originMeta"
as-config
/>
</CardPanel>
</TabContent>

<TabContent name="validation">
<CardPanel :heading="__('Validation')">
<FieldValidationBuilder :config="values" @updated="updateField('validate', $event)" />
</CardPanel>
</TabContent>
</div>
</Tabs>
</TabContent>

<TabContent name="conditions">
<CardPanel :heading="__('Conditions')">
<FieldConditionsBuilder
:config="values"
:suggestable-fields="suggestableConditionFields"
@updated="updateFieldConditions"
@updated-always-save="updateAlwaysSave"
/>
</CardPanel>
</TabContent>

<TabContent name="validation">
<CardPanel :heading="__('Validation')">
<FieldValidationBuilder :config="values" @updated="updateField('validate', $event)" />
</CardPanel>
</TabContent>
</div>
</Tabs>
</div>
</section>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/ui/Modal/Close.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const closeModal = inject('closeModal');
<template>
<div data-ui-modal-close @click="closeModal">
<slot>
<Button variant="ghost" size="sm" icon="x" class="absolute top-3 right-2" />
<Button variant="ghost" size="sm" icon="x" class="absolute top-0 right-2" />
</slot>
</div>
</template>