yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andy Butland
2025-04-22 10:01:05 +02:00
parent 6987515cbe fb39711571
commit 1dc9f8540d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/rte/components/rte-base.element.ts
View File

@@ -242,7 +242,7 @@ export abstract class UmbPropertyEditorUiRteElementBase
context.setValue(super.value);
},
'motherObserver',
'blockManagerObserver',
);
}

4
src/Umbraco.Web.UI.Client/src/packages/tiptap/components/input-tiptap/input-tiptap.element.ts
View File

@@ -237,7 +237,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
justify-content: center;
}
:host(:not([pristine]):invalid),
:host(:invalid:not([pristine])),
/* polyfill support */
:host(:not([pristine])[internals-invalid]) {
--umb-tiptap-edge-border-color: var(--uui-color-invalid);
@@ -250,7 +250,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
display: flex;
overflow: auto;
border-radius: var(--uui-border-radius);
border: 1px solid var(--uui-color-border);
border: 1px solid var(--umb-tiptap-edge-border-color, var(--uui-color-border));
padding: 1rem;
box-sizing: border-box;
height: 100%;

8
src/Umbraco.Web.UI.Client/src/packages/tiptap/property-editors/tiptap/property-editor-ui-tiptap.element.ts
View File

@@ -1,6 +1,6 @@
import type { UmbInputTiptapElement } from '../../components/input-tiptap/input-tiptap.element.js';
import { UmbPropertyEditorUiRteElementBase } from '@umbraco-cms/backoffice/rte';
import { customElement, html, type PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
import { css, customElement, html, type PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
import '../../components/input-tiptap/input-tiptap.element.js';
@@ -74,6 +74,12 @@ export class UmbPropertyEditorUiTiptapElement extends UmbPropertyEditorUiRteElem
@change=${this.#onChange}></umb-input-tiptap>
`;
}
static override styles = css`
:host(:invalid:not([pristine])) umb-input-tiptap {
--umb-tiptap-edge-border-color: var(--uui-color-invalid);
}
`;
}
export { UmbPropertyEditorUiTiptapElement as element };