From 7114267f50192cb94ec35263144e2006f598d18e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 29 Apr 2025 21:32:14 +0200 Subject: [PATCH 1/8] add border to description --- .../content-type-workspace-editor-header.element.ts | 1 - .../webhook/workspace/webhook-workspace-editor.element.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts index 16d15246524d..f0a00abe969b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts @@ -136,7 +136,6 @@ export class UmbContentTypeWorkspaceEditorHeaderElement extends UmbLitElement { #description { width: 100%; --uui-input-height: var(--uui-size-8); - --uui-input-border-color: transparent; } #description:hover { diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts index bc43bceb7781..703a9045e534 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts @@ -79,7 +79,6 @@ export class UmbWebhookWorkspaceEditorElement extends UmbLitElement { #description { width: 100%; --uui-input-height: var(--uui-size-8); - --uui-input-border-color: transparent; } #description:hover { From 2fef323075b6e4d90e06fcedbaafc95faabe56ad Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 29 Apr 2025 21:32:39 +0200 Subject: [PATCH 2/8] reposition menu --- .../workspace-editor.element.ts | 3 +-- .../workspace-entity-action-menu.element.ts | 19 ++++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts index ae686a524307..6c16b3aac4e8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts @@ -90,9 +90,8 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { ${this.#renderBackButton()} - ${this.#renderViews()} - ${this.#renderRoutes()} + ${this.#renderViews()} ${this.#renderRoutes()} ${when( !this.enforceNoFooter, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts index b1f5f733a267..2a576bc608b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts @@ -57,9 +57,9 @@ export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement { - ${this.localize.term('general_actions')} - + label=${this.localize.term('general_actions')} + compact> + uui-button { - height: 100%; - } - `, - ]; + static override styles = [UmbTextStyles, css``]; } declare global { From d49b6b5fdbbc7f1f9e0ba3be470b74ac8dac37d9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 29 Apr 2025 21:32:47 +0200 Subject: [PATCH 3/8] reposition menu --- .../body-layout/body-layout.element.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts index a9a5ff2f5428..24bfdef2f431 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts @@ -101,13 +101,6 @@ export class UmbBodyLayoutElement extends LitElement { this._headerSlotHasChildren = this.#hasNodes(e); this.#setSlotVisibility(e.target as HTMLElement, this._headerSlotHasChildren); }}> - { - this._navigationSlotHasChildren = this.#hasNodes(e); - this.#setSlotVisibility(e.target as HTMLElement, this._navigationSlotHasChildren); - }}> + { + this._navigationSlotHasChildren = this.#hasNodes(e); + this.#setSlotVisibility(e.target as HTMLElement, this._navigationSlotHasChildren); + }}> @@ -205,6 +205,11 @@ export class UmbBodyLayoutElement extends LitElement { min-width: 0; } + #action-menu-slot { + margin-left: calc(var(--uui-size-space-5) * -1); + margin-right: var(--uui-size-layout-1); + } + #navigation-slot { margin-left: auto; } From 8bdbb66d0d910932a0bd56cf15b4f04680c8dfb1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 30 Apr 2025 09:50:47 +0200 Subject: [PATCH 4/8] try and fix e2e tests --- .../workspace-entity-action-menu.element.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts index 2a576bc608b8..87eaf656c3ee 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts @@ -58,6 +58,7 @@ export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement { id="action-button" popovertarget="workspace-entity-action-menu-popover" label=${this.localize.term('general_actions')} + aria-label=${this.localize.term('general_actions')} compact> From d0842c8f95f239d61476dafe757a884aeadc0133 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 30 Apr 2025 11:13:52 +0200 Subject: [PATCH 5/8] add data-mark --- .../workspace-entity-action-menu.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts index 87eaf656c3ee..8e2b62f8c130 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts @@ -56,9 +56,9 @@ export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement { ? html` From 83e8412ed0c59c6cf9b50500ab2c2affec2145dd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 1 May 2025 14:31:58 +0200 Subject: [PATCH 6/8] use correct function --- .../tests/DefaultConfig/Members/MemberGroups.spec.ts | 2 +- .../tests/DefaultConfig/Members/Members.spec.ts | 2 +- .../tests/DefaultConfig/Users/UserGroups.spec.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts index ad603889fcaf..54618fa4a7b9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts @@ -58,7 +58,7 @@ test('can delete a member group', {tag: '@smoke'}, async ({umbracoApi, umbracoUi // Act await umbracoUi.memberGroup.clickMemberGroupLinkByName(memberGroupName); - await umbracoUi.memberGroup.clickActionsButton(); + await umbracoUi.memberGroup.clickActionButton(); await umbracoUi.memberGroup.clickDeleteButton(); await umbracoUi.memberGroup.clickConfirmToDeleteButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts index d8d9540b2eda..a36e52b53000 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts @@ -217,7 +217,7 @@ test('can delete member', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.member.clickMemberLinkByName(memberName); - await umbracoUi.memberGroup.clickActionsButton(); + await umbracoUi.memberGroup.clickActionButton(); await umbracoUi.memberGroup.clickDeleteButton(); await umbracoUi.memberGroup.clickConfirmToDeleteButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/UserGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/UserGroups.spec.ts index a2ac69290f91..3f554a32aba8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/UserGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/UserGroups.spec.ts @@ -115,7 +115,7 @@ test('can delete a user group', async ({umbracoApi, umbracoUi}) => { await umbracoUi.userGroup.clickUserGroupWithName(userGroupName); // Act - await umbracoUi.userGroup.clickActionsButton(); + await umbracoUi.userGroup.clickActionButton(); await umbracoUi.userGroup.clickDeleteButton(); await umbracoUi.userGroup.clickConfirmToDeleteButton(); From a997626131bd72a6633e06326a5f7e08a83e3a8c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 1 May 2025 14:42:05 +0200 Subject: [PATCH 7/8] bump helpers --- tests/Umbraco.Tests.AcceptanceTest/package-lock.json | 8 ++++---- tests/Umbraco.Tests.AcceptanceTest/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index 88ff1443eb51..05e729b5ca41 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^2.0.33", - "@umbraco/playwright-testhelpers": "^16.0.7", + "@umbraco/playwright-testhelpers": "^16.0.9", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" @@ -66,9 +66,9 @@ } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "16.0.7", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.7.tgz", - "integrity": "sha512-mb6i3lxz3M+PXko8wkX7dcRNU669CTroRX10O0EyXLQWmLXHOzUCOcdSiAjaVGczv9Ht0fmjXBL8BtU93bIZlA==", + "version": "16.0.9", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.9.tgz", + "integrity": "sha512-nfoRZNYrD2PP6k/GljiINCEA8VM6uvOAlqmkhYOdiTzrgLmVRqZExsNskm1BhlcxDhE6+XZlpjTcFIotFBKLFQ==", "dependencies": { "@umbraco/json-models-builders": "2.0.33", "node-fetch": "^2.6.7" diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 94e5f3dc0b9a..585fe0258840 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.33", - "@umbraco/playwright-testhelpers": "^16.0.7", + "@umbraco/playwright-testhelpers": "^16.0.9", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" From 69ebf6a6a146c8c1dffc9a4537f27ade91bde0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 1 May 2025 16:07:22 +0200 Subject: [PATCH 8/8] style correction --- ...ntent-type-workspace-editor-header.element.ts | 6 +++++- .../body-layout/body-layout.element.ts | 6 ------ .../workspace-entity-action-menu.element.ts | 16 +++++++++++++--- .../webhook-workspace-editor.element.ts | 3 +++ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts index f0a00abe969b..aed4ff718d0b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/global-components/content-type-workspace-editor-header.element.ts @@ -126,16 +126,18 @@ export class UmbContentTypeWorkspaceEditorHeaderElement extends UmbLitElement { display: flex; flex: 1 1 auto; flex-direction: column; - gap: var(--uui-size-space-1); } #name { width: 100%; + z-index: 1; } #description { width: 100%; + margin-top: 1px; --uui-input-height: var(--uui-size-8); + --uui-input-border-color: transparent; } #description:hover { @@ -146,6 +148,8 @@ export class UmbContentTypeWorkspaceEditorHeaderElement extends UmbLitElement { font-size: var(--uui-size-8); height: 60px; width: 60px; + --uui-button-border-color: transparent; + --uui-button-border-color-hover: var(--uui-color-border); } `, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts index 24bfdef2f431..14a5caa954d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts @@ -204,12 +204,6 @@ export class UmbBodyLayoutElement extends LitElement { box-sizing: border-box; min-width: 0; } - - #action-menu-slot { - margin-left: calc(var(--uui-size-space-5) * -1); - margin-right: var(--uui-size-layout-1); - } - #navigation-slot { margin-left: auto; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts index 8e2b62f8c130..eb38a8fa53a1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts @@ -58,8 +58,7 @@ export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement { id="action-button" data-mark="workspace:action-menu-button" popovertarget="workspace-entity-action-menu-popover" - label=${this.localize.term('general_actions')} - compact> + label=${this.localize.term('general_actions')}> uui-button { + height: 100%; + } + `, + ]; } declare global { diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts index 703a9045e534..c5cef0767e12 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/workspace/webhook-workspace-editor.element.ts @@ -74,11 +74,14 @@ export class UmbWebhookWorkspaceEditorElement extends UmbLitElement { #name { width: 100%; + z-index: 1; } #description { width: 100%; + margin-top: -1px; --uui-input-height: var(--uui-size-8); + --uui-input-border-color: transparent; } #description:hover {