From 2a04f07511f109fb702eaf06fcaaf8697f16b1f1 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:38:05 +0100 Subject: [PATCH] update to umb icon where custom icon is used --- .../block-type-card/block-type-card.element.ts | 2 +- .../components/collection-view-bundle.element.ts | 2 +- .../components/header-app/header-app-button.element.ts | 9 ++++----- .../input-multi-url/input-multi-url.element.ts | 2 +- .../packages/core/entity-action/entity-action.element.ts | 2 +- .../menu/menu-item-layout/menu-item-layout.element.ts | 2 +- .../section-main-views/section-main-views.element.ts | 2 +- .../workspace-editor/workspace-editor.element.ts | 2 +- .../data-type-picker-flow-modal.element.ts | 2 +- .../property-editor-ui-picker-modal.element.ts | 2 +- .../details/data-type-details-workspace-view.element.ts | 2 +- .../input-document-type/input-document-type.element.ts | 2 +- .../action/create-document-collection-action.element.ts | 2 +- .../views/grid/document-grid-collection-view.element.ts | 5 +++-- .../input-document-root-picker.element.ts | 5 ++--- .../components/input-document/input-document.element.ts | 2 +- .../permissions/permissions-modal.element.ts | 2 +- .../tree/tree-item/document-tree-item.element.ts | 2 +- .../input-media-type/input-media-type.element.ts | 2 +- .../action/create-media-collection-action.element.ts | 2 +- .../input-member-type/input-member-type.element.ts | 2 +- .../installed-packages-section-view-item.element.ts | 2 +- .../packages/search/search-modal/search-modal.element.ts | 2 +- .../modals/query-builder/query-builder-modal.element.ts | 2 +- .../input-user-group/user-group-input.element.ts | 2 +- .../user-group-picker/user-group-picker-modal.element.ts | 2 +- 26 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts index d1f317c37d..14db77d673 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts @@ -68,7 +68,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement { href=${ifDefined(this.href)} .name=${this.name ?? this._fallbackName ?? ''} .background=${this.backgroundColor}> - + `; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts index 335da0a58d..c651449d27 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts @@ -85,7 +85,7 @@ export class UmbCollectionViewBundleElement extends UmbLitElement { } #renderItemDisplay(view: ManifestCollectionView) { - return html``; + return html``; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts index 0ab9ab24bb..c3b915fcc2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts @@ -1,12 +1,11 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, LitElement, customElement, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestHeaderAppButtonKind, - UmbBackofficeManifestKind} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, + UmbBackofficeManifestKind, } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; const manifest: UmbBackofficeManifestKind = { type: 'kind', @@ -32,7 +31,7 @@ export class UmbHeaderAppButtonElement extends LitElement { label="${ifDefined(this.manifest?.meta.label)}" href="${ifDefined(this.manifest?.meta.href)}" compact> - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts index 6b678cc7a7..38b14583f7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts @@ -207,7 +207,7 @@ export class UmbInputMultiUrlElement extends FormControlMixin(UmbLitElement) { .name="${link.name || ''}" .detail="${(link.url || '') + (link.queryString || '')}" @open="${() => this._temporary_onClick_editItem(index)}"> - + Edit Remove diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts index 14cab2580b..32f5ae5164 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts @@ -94,7 +94,7 @@ export class UmbEntityActionElement extends UmbLitElement { @click-label=${this.#onClickLabel} @click=${this.#onClick}> ${this._manifest?.meta.icon - ? html`` + ? html`` : nothing} `; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts index b76044d24a..6b2b0b4dec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts @@ -38,7 +38,7 @@ export class UmbMenuItemLayoutElement extends UmbLitElement { render() { return html` - + ${this.entityType ? html` - + ${viewName} `; 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 e489e80b7a..db5fa22a83 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 @@ -113,7 +113,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { .label="${view.meta.label || view.name}" href="${this._routerPath}/view/${view.meta.pathname}" ?active="${'view/' + view.meta.pathname === this._activePath}"> - + ${view.meta.label || view.name} `, diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts index 55acd43813..a64a3a63d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts @@ -260,7 +260,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement< label="${propertyEditorUI.meta.label || propertyEditorUI.name}" href=${this._dataTypePickerModalRouteBuilder!({ uiAlias: propertyEditorUI.alias })}>
- + ${propertyEditorUI.meta.label || propertyEditorUI.name}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts index 2a32afa768..938329aea6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts @@ -125,7 +125,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement< (propertyEditorUI) => html`
    • `, diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts index 833e43795c..b24c9ab3a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts @@ -84,7 +84,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement im property-editor-schema-alias=${this._propertyEditorSchemaAlias} standalone> ${this._propertyEditorUiIcon - ? html` ` + ? html` ` : ''} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts index bf6219a855..3e5be1075f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts @@ -196,7 +196,7 @@ export class UmbInputDocumentTypeElement extends FormControlMixin(UmbLitElement) #renderIcon(item: UmbDocumentTypeItemModel) { if (!item.icon) return; - return html``; + return html``; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts index 61faa1a331..abc2c4a7af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts @@ -125,7 +125,7 @@ export class UmbCreateDocumentCollectionActionElement extends UmbLitElement { this._allowedDocumentTypes, (item) => html` - + `, )} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.ts index d53b20bb48..f924c9c90e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.ts @@ -112,7 +112,7 @@ export class UmbDocumentGridCollectionViewElement extends UmbLitElement { @open=${() => this.#onOpen(item.unique ?? '')} @selected=${() => this.#onSelect(item)} @deselected=${() => this.#onDeselect(item)}> - + ${this.#renderState(item)} ${this.#renderProperties(sortOrder, item)} `; @@ -151,7 +151,8 @@ export class UmbDocumentGridCollectionViewElement extends UmbLitElement { ${repeat( this._userDefinedProperties, (column) => column.alias, - (column) => html`
  • ${column.header}: ${getPropertyValueByAlias(sortOrder, item, column.alias)}
    • `, + (column) => + html`
  • ${column.header}: ${getPropertyValueByAlias(sortOrder, item, column.alias)}
    • `, )} `; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts index 540ebc06f4..cd640acaa2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts @@ -190,11 +190,10 @@ export class UmbInputDocumentRootPickerElement extends FormControlMixin(UmbLitEl if (!this.#dynamicRootOrigin) return; return html` - + - + this.#removeDynamicRootQueryStep(item)} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts index 2d5f350910..b3ffa6dc36 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts @@ -202,7 +202,7 @@ export class UmbInputDocumentElement extends FormControlMixin(UmbLitElement) { #renderIcon(item: UmbDocumentItemModel) { if (!item.documentType.icon) return; - return html``; + return html``; } #renderIsTrashed(item: UmbDocumentItemModel) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts index fb480097c9..fc61ded76b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts @@ -137,7 +137,7 @@ export class UmbPermissionsModalElement extends UmbLitElement { .userPermissionAliases=${userGroup.permissions} @open=${() => this.#openUserPermissionsModal(userGroup.id)} standalone> - ${userGroup.icon ? html`` : nothing} + ${userGroup.icon ? html`` : nothing} `, )} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts index d733c7fccf..229f03f137 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts @@ -32,7 +32,7 @@ export class UmbDocumentTreeItemElement extends UmbLitElement implements UmbTree ${this.item?.documentType.icon ? html` - + ` : nothing} diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts index e73e3f8d8e..f6f590da8e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts @@ -144,7 +144,7 @@ export class UmbInputMediaTypeElement extends FormControlMixin(UmbLitElement) { #renderIcon(item: UmbMediaTypeItemModel) { if (!item.icon) return; - return html``; + return html``; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts index b222ad2854..5b01bdfece 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts @@ -122,7 +122,7 @@ export class UmbCreateMediaCollectionActionElement extends UmbLitElement { this._allowedMediaTypes, (item) => html` - + `, )} diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts index b1849b713a..d15f529035 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts @@ -148,7 +148,7 @@ export class UmbInputMemberTypeElement extends FormControlMixin(UmbLitElement) { #renderIcon(item: MemberTypeItemResponseModel) { if (!item.icon) return; - return html``; + return html``; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts index 5f363a6fe3..91cd247e30 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts @@ -98,7 +98,7 @@ export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement { version="${ifDefined(this.version ?? undefined)}" @open=${this._onConfigure} ?disabled="${!this._packageView}"> - ${this.customIcon ? html`` : nothing} + ${this.customIcon ? html`` : nothing}
    ${this.hasPendingMigrations ? html` - ${item.icon ? html`` : this.#renderHashTag()} + ${item.icon ? html`` : this.#renderHashTag()} ${item.name} ${item.url ? html`${item.url}` : nothing} diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts index b962240368..7b9e4cd8a0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts @@ -252,7 +252,7 @@ export default class UmbTemplateQueryBuilderModalElement extends UmbModalBaseEle ${this._templateQuery?.executionTime ?? 0} ms ${this._templateQuery?.sampleResults.map( - (sample) => html`${sample.name}`, + (sample) => html`${sample.name}`, ) ?? ''}
    ${this._templateQuery?.queryExpression ?? ''} diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts index 90135464d7..d1f27adce2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts @@ -115,7 +115,7 @@ export class UmbUserGroupInputElement extends FormControlMixin(UmbLitElement) { if (!item.unique) return; return html` - ${item.icon ? html`` : nothing} + ${item.icon ? html`` : nothing} this.#pickerContext.requestRemoveItem(item.unique)} label="Remove ${item.name}" diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts index c0210a3ee2..4f1912a67f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts @@ -71,7 +71,7 @@ export class UmbUserGroupPickerModalElement extends UmbModalBaseElement< @selected=${(event: UUIMenuItemEvent) => this.#onSelected(event, item)} @deselected=${(event: UUIMenuItemEvent) => this.#onDeselected(event, item)} ?selected=${this.#selectionManager.isSelected(item.unique)}> - +     `, )}