From 6aa58d7e232d42433aca87688cce19cb5b13fe0f Mon Sep 17 00:00:00 2001 From: Nico Hoffmann Date: Mon, 27 Nov 2023 20:27:01 +0800 Subject: [PATCH 01/15] Slug field: fix wizard button Fixes #6008 --- panel/src/components/Forms/Field/SlugField.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/panel/src/components/Forms/Field/SlugField.vue b/panel/src/components/Forms/Field/SlugField.vue index e3743dc362..be006dadad 100644 --- a/panel/src/components/Forms/Field/SlugField.vue +++ b/panel/src/components/Forms/Field/SlugField.vue @@ -1,7 +1,13 @@ @@ -208,6 +205,19 @@ export default { } return buttons; + }, + positions() { + // only set position when toolbar is inline, + // otherwise the top value is overwriting the top offset + // for the sticky non-inline toolbar + if (this.inline === false) { + return null; + } + + return { + top: this.position.y + "px", + left: this.position.x + "px" + }; } }, methods: { From f9fd13332a186c0f37412904444116f93dc17106 Mon Sep 17 00:00:00 2001 From: Nico Hoffmann Date: Thu, 30 Nov 2023 09:38:39 +0800 Subject: [PATCH 06/15] Fix slug field in file rename dialog Fixes #6024 --- config/areas/files/dialogs.php | 2 +- panel/lab/components/fields/slug/index.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/areas/files/dialogs.php b/config/areas/files/dialogs.php index 3d9d97b3c9..8707bd0da5 100644 --- a/config/areas/files/dialogs.php +++ b/config/areas/files/dialogs.php @@ -26,7 +26,7 @@ 'type' => 'slug', 'required' => true, 'icon' => 'title', - 'allow' => '@._-', + 'allow' => 'a-z0-9@._-', 'after' => '.' . $file->extension(), 'preselect' => true ] diff --git a/panel/lab/components/fields/slug/index.vue b/panel/lab/components/fields/slug/index.vue index e92e4600db..9a7eafc527 100644 --- a/panel/lab/components/fields/slug/index.vue +++ b/panel/lab/components/fields/slug/index.vue @@ -2,7 +2,7 @@ From 5e7c38dff0b56e0c84c727c117dcc4554ba3e526 Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 30 Nov 2023 12:12:00 +0100 Subject: [PATCH 07/15] Fix bottom margin on the collection pagination in a models dialog --- panel/src/components/Dialogs/ModelsDialog.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/panel/src/components/Dialogs/ModelsDialog.vue b/panel/src/components/Dialogs/ModelsDialog.vue index 6ccff52b1b..0e4cdc2df5 100644 --- a/panel/src/components/Dialogs/ModelsDialog.vue +++ b/panel/src/components/Dialogs/ModelsDialog.vue @@ -165,4 +165,7 @@ export default { .k-models-dialog .k-list-item { cursor: pointer; } +.k-models-dialog .k-collection-footer { + margin-bottom: var(--spacing-6); +} From f844e74b307eb612c3d075dfd182164b0e24a44e Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 30 Nov 2023 12:34:34 +0100 Subject: [PATCH 08/15] Fix in more patching way --- panel/src/components/Dialogs/ModelsDialog.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel/src/components/Dialogs/ModelsDialog.vue b/panel/src/components/Dialogs/ModelsDialog.vue index 0e4cdc2df5..d0a5443314 100644 --- a/panel/src/components/Dialogs/ModelsDialog.vue +++ b/panel/src/components/Dialogs/ModelsDialog.vue @@ -165,7 +165,7 @@ export default { .k-models-dialog .k-list-item { cursor: pointer; } -.k-models-dialog .k-collection-footer { - margin-bottom: var(--spacing-6); +.k-models-dialog .k-collection-footer .k-pagination { + margin-bottom: 0; } From 242a6d3f61166e3ab041c8ae620cbfe934457cdf Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 30 Nov 2023 13:00:21 +0100 Subject: [PATCH 09/15] Fix the bottom margin for the info box in the lab --- panel/src/components/Lab/IndexView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel/src/components/Lab/IndexView.vue b/panel/src/components/Lab/IndexView.vue index 0bc219c5ce..05821fd700 100644 --- a/panel/src/components/Lab/IndexView.vue +++ b/panel/src/components/Lab/IndexView.vue @@ -42,7 +42,7 @@ export default { .k-lab-index-view .k-header { margin-bottom: 0; } -.k-lab-index-view > .k-box { +.k-lab-index-view .k-panel-main > .k-box { margin-bottom: var(--spacing-8); } .k-lab-index-view .k-list-items { From 662c16d2b45d75ed73ddb08064f2af55792409b4 Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 30 Nov 2023 13:16:15 +0100 Subject: [PATCH 10/15] Fix layout field when there are no fieldsets --- panel/src/components/Forms/Field/LayoutField.vue | 7 +++++-- panel/src/components/Forms/Layouts/Layouts.vue | 13 ++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/panel/src/components/Forms/Field/LayoutField.vue b/panel/src/components/Forms/Field/LayoutField.vue index 33ab5de6aa..a3c1c926cb 100644 --- a/panel/src/components/Forms/Field/LayoutField.vue +++ b/panel/src/components/Forms/Field/LayoutField.vue @@ -1,6 +1,6 @@