diff --git a/src/Umbraco.Web.UI.Client/src/css/dark.theme.css b/src/Umbraco.Web.UI.Client/src/css/dark.theme.css index 3b5c546d2c..cb9d0183d8 100644 --- a/src/Umbraco.Web.UI.Client/src/css/dark.theme.css +++ b/src/Umbraco.Web.UI.Client/src/css/dark.theme.css @@ -6,7 +6,7 @@ --uui-color-current: #316dca; --uui-color-current-emphasis: #3e79d0; --uui-color-current-standalone: #5b8dd7; - --uui-color-current-contrast: #f000; + --uui-color-current-contrast: #eeeeef; --uui-color-disabled: #434c56; --uui-color-disabled-standalone: #545d68; --uui-color-disabled-contrast: #fcfcfc4d; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-item/ref-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-item/ref-item.element.ts index 550900a7af..589c5fcb01 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-item/ref-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/ref-item/ref-item.element.ts @@ -1,5 +1,6 @@ -import { html, customElement, css, property, when, nothing } from '@umbraco-cms/backoffice/external/lit'; +import { html, customElement, css, property, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UUIRefElement, UUIRefEvent, UUIRefNodeElement } from '@umbraco-cms/backoffice/external/uui'; @customElement('umb-ref-item') @@ -30,11 +31,7 @@ export class UmbRefItemElement extends UmbElementMixin(UUIRefElement) { @click=${this.handleOpenClick} @keydown=${this.handleOpenKeydown} ?disabled=${this.disabled}> - ${when( - this.icon, - () => html``, - () => nothing, - )} + ${when(this.icon, () => html``)}
${this.name}
${this.detail} @@ -48,6 +45,7 @@ export class UmbRefItemElement extends UmbElementMixin(UUIRefElement) { static styles = [ ...UUIRefElement.styles, ...UUIRefNodeElement.styles, + UmbTextStyles, css` :host { padding: calc(var(--uui-size-4) + 1px); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts index d3eeb31651..919c139b95 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts @@ -59,9 +59,8 @@ export class UmbPropertyEditorUIMemberGroupPickerElement extends UmbLitElement i @change=${this._onChange} .selection=${this._items} .min=${this._limitMin ?? 0} - .max=${this._limitMax ?? Infinity} - >Add + .max=${this._limitMax ?? Infinity}> + `; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts index 1782bcc87f..ebb7f464fe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts @@ -1,8 +1,9 @@ import type { UmbInputToggleElement } from '../../../components/input-toggle/input-toggle.element.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-toggle @@ -28,9 +29,9 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U this._showLabels = config?.getValueByAlias('showLabels'); } - private _onChange(event: CustomEvent) { - this.value = (event.target as UmbInputToggleElement).checked; - this.dispatchEvent(new CustomEvent('property-value-change')); + #onChange(event: CustomEvent & { target: UmbInputToggleElement }) { + this.value = event.target.checked; + this.dispatchEvent(new UmbPropertyValueChangeEvent()); } render() { @@ -39,7 +40,7 @@ export class UmbPropertyEditorUIToggleElement extends UmbLitElement implements U .labelOn="${this._labelOn}" .labelOff=${this._labelOff} ?showLabels="${this._showLabels}" - @change="${this._onChange}">`; + @change="${this.#onChange}">`; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts index 82062c8664..aa5961bfb1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts @@ -28,7 +28,7 @@ const entityActions: Array = [ type: 'modal', alias: 'Umb.Modal.DocumentTypeCreateOptions', name: 'Document Type Create Options Modal', - js: () => import('./modal/document-type-create-options-modal.element.js'), + element: () => import('./modal/document-type-create-options-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts index 867d50f197..12078a7633 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts @@ -52,7 +52,6 @@ export class UmbPropertyEditorUIDocumentTypePickerElement extends UmbLitElement .min=${this._limitMin ?? 0} .max=${this._limitMax ?? Infinity} .elementTypesOnly=${this._onlyElementTypes ?? false}> - Add ` : ''; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts index d04d9fd5a1..cba1329e35 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.DocumentPicker', name: 'Document Picker Property Editor UI', - js: () => import('./property-editor-ui-document-picker.element.js'), + element: () => import('./property-editor-ui-document-picker.element.js'), meta: { label: 'Document Picker', propertyEditorSchemaAlias: 'Umbraco.ContentPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts index f2c2c7f688..7fc5c9d526 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts @@ -130,7 +130,7 @@ const workspaceActions: Array = [ weight: 90, api: () => import('./actions/save-and-preview.action.js'), meta: { - label: 'Save And Preview', + label: '#buttons_saveAndPreview', }, conditions: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts index 3aba86487d..a8c3c15d98 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts @@ -114,6 +114,7 @@ export class UmbAppLanguageSelectElement extends UmbLitElement { } #toggle { + color: var(--uui-color-text); width: var(--umb-section-sidebar-width); text-align: left; background: none; @@ -132,6 +133,10 @@ export class UmbAppLanguageSelectElement extends UmbLitElement { #toggle:hover { background-color: var(--uui-color-surface-emphasis); } + + uui-menu-item { + color: var(--uui-color-text); + } `, ]; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts index 25fce15f1d..f6e7749aab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts @@ -74,7 +74,6 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme .selection=${this._items} .min=${this._limitMin} .max=${this._limitMax}> - Add `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-name-column-layout.element.ts index 912a78edb0..d668601b5e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-name-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-name-column-layout.element.ts @@ -1,5 +1,6 @@ -import { html, LitElement, customElement, property } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, LitElement, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbTableItem } from '@umbraco-cms/backoffice/components'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @customElement('umb-user-group-table-name-column-layout') export class UmbUserGroupTableNameColumnLayoutElement extends LitElement { @@ -10,12 +11,18 @@ export class UmbUserGroupTableNameColumnLayoutElement extends LitElement { value!: any; render() { - return html` - ${this.value.name} - `; + const href = `section/user-management/view/user-groups/user-group/edit/${this.item.id}`; + return html`${this.value.name}`; } + + static styles = [ + UmbTextStyles, + css` + a { + font-weight: bold; + } + `, + ]; } export default UmbUserGroupTableNameColumnLayoutElement;