Merge branch 'contrib' of https://github.com/umbraco/Umbraco-CMS into contrib

# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Login/package-lock.json
This commit is contained in:
Sebastiaan Janssen
2025-05-05 14:11:45 +02:00
3 changed files with 14 additions and 3 deletions

View File

@@ -43,7 +43,7 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
margin="6"
placement="top-end"
@toggle=${this.#onPopoverToggle}>
<umb-popover-layout>
<umb-popover-layout id="workspace-action-popover-layout">
<uui-scroll-container>
${repeat(
this.items,
@@ -73,12 +73,17 @@ export class UmbWorkspaceActionMenuElement extends UmbLitElement {
#workspace-action-popover {
min-width: 200px;
}
#popover-trigger {
--uui-button-padding-top-factor: 0;
--uui-button-padding-bottom-factor: 0.125;
}
#workspace-action-popover-layout {
overflow: visible;
}
`,
];
}

View File

@@ -8,6 +8,12 @@ import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/
import '../cascading-menu-popover/cascading-menu-popover.element.js';
/**
* Provides a sticky toolbar for the {@link UmbInputTiptapElement}
* @element umb-tiptap-toolbar
* @cssprop --umb-tiptap-edge-border-color - Defines the edge border color
* @cssprop --umb-tiptap-top - Defines the top value for the sticky toolbar
*/
@customElement('umb-tiptap-toolbar')
export class UmbTiptapToolbarElement extends UmbLitElement {
#attached = false;
@@ -108,7 +114,7 @@ export class UmbTiptapToolbarElement extends UmbLitElement {
flex-direction: column;
position: sticky;
top: -25px;
top: var(--umb-tiptap-top,-25px);
left: 0;
right: 0;
padding: var(--uui-size-3);

View File

@@ -19,7 +19,7 @@
"@umbraco-cms/backoffice": "15.3.0",
"msw": "^2.7.0",
"typescript": "^5.7.3",
"vite": "^6.2.6",
"vite": "^6.3.4",
"vite-tsconfig-paths": "^5.1.4"
},
"msw": {