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

update to umb icon where custom icon is used

Browse Source
This commit is contained in:
Lone Iversen
2024-02-29 13:38:05 +01:00
parent e129d50c8e
commit 2a04f07511
26 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts
View File

@@ -68,7 +68,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement {
href=${ifDefined(this.href)}
.name=${this.name ?? this._fallbackName ?? ''}
.background=${this.backgroundColor}>
<uui-icon name=${this._fallbackIcon ?? ''} style="color:${this.iconColor}"></uui-icon>
<umb-icon name=${this._fallbackIcon ?? ''} style="color:${this.iconColor}"></umb-icon>
<slot name="actions" slot="actions"> </slot>
</uui-card-block-type>
`;

2
src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts
View File

@@ -85,7 +85,7 @@ export class UmbCollectionViewBundleElement extends UmbLitElement {
}
#renderItemDisplay(view: ManifestCollectionView) {
return html`<uui-icon name=${view.meta.icon}></uui-icon>`;
return html`<umb-icon name=${view.meta.icon}></u-icon>`;
}
static styles = [

9
src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts
View File

@@ -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>
<uui-icon name="${ifDefined(this.manifest?.meta.icon)}"></uui-icon>
<umb-icon name="${ifDefined(this.manifest?.meta.icon)}"></umb-icon>
</uui-button>
`;
}

2
src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts
View File

@@ -207,7 +207,7 @@ export class UmbInputMultiUrlElement extends FormControlMixin(UmbLitElement) {
.name="${link.name || ''}"
.detail="${(link.url || '') + (link.queryString || '')}"
@open="${() => this._temporary_onClick_editItem(index)}">
<uui-icon slot="icon" name="${link.icon || 'icon-link'}"></uui-icon>
<umb-icon slot="icon" name="${link.icon || 'icon-link'}"></umb-icon>
<uui-action-bar slot="actions">
<uui-button .href=${this._modalRoute?.({ index })} label="Edit link">Edit</uui-button>
<uui-button @click="${() => this._removeItem(index)}" label="Remove link">Remove</uui-button>

2
src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts
View File

@@ -94,7 +94,7 @@ export class UmbEntityActionElement extends UmbLitElement {
@click-label=${this.#onClickLabel}
@click=${this.#onClick}>
${this._manifest?.meta.icon
? html`<uui-icon slot="icon" name="${this._manifest?.meta.icon}"></uui-icon>`
? html`<umb-icon slot="icon" name="${this._manifest?.meta.icon}"></umb-icon>`
: nothing}
</uui-menu-item>
`;

2
src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts
View File

@@ -38,7 +38,7 @@ export class UmbMenuItemLayoutElement extends UmbLitElement {
render() {
return html`<uui-menu-item href="${ifDefined(this.href)}" label=${this.label} ?has-children=${this.hasChildren}>
<uui-icon slot="icon" name=${this.iconName}></uui-icon>
<umb-icon slot="icon" name=${this.iconName}></umb-icon>
${this.entityType
? html`<umb-entity-actions-bundle
slot="actions"

2
src/Umbraco.Web.UI.Client/src/packages/core/section/section-main-views/section-main-views.element.ts
View File

@@ -134,7 +134,7 @@ export class UmbSectionMainViewElement extends UmbLitElement {
href="${this._routerPath}/${viewPath}"
label="${viewName}"
?active="${this._activePath === viewPath}">
<uui-icon slot="icon" name=${view.meta.icon}></uui-icon>
<umb-icon slot="icon" name=${view.meta.icon}></umb-icon>
${viewName}
</uui-tab>
`;

2
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
View File

@@ -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}">
<uui-icon slot="icon" name="${view.meta.icon}"></uui-icon>
<umb-icon slot="icon" name="${view.meta.icon}"></umb-icon>
${view.meta.label || view.name}
</uui-tab>
`,

2
src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
View File

@@ -260,7 +260,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
label="${propertyEditorUI.meta.label || propertyEditorUI.name}"
href=${this._dataTypePickerModalRouteBuilder!({ uiAlias: propertyEditorUI.alias })}>
<div class="item-content">
<uui-icon name="${propertyEditorUI.meta.icon}" class="icon"></uui-icon>
<umb-icon name="${propertyEditorUI.meta.icon}" class="icon"></umb-icon>
${propertyEditorUI.meta.label || propertyEditorUI.name}
</div>
</uui-button>

2
src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
View File

@@ -125,7 +125,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
(propertyEditorUI) =>
html` <li class="item" ?selected=${this.value.selection.includes(propertyEditorUI.alias)}>
<button type="button" @click="${() => this.#handleClick(propertyEditorUI)}">
<uui-icon name="${propertyEditorUI.meta.icon}" class="icon"></uui-icon>
<umb-icon name="${propertyEditorUI.meta.icon}" class="icon"></umb-icon>
${propertyEditorUI.meta.label || propertyEditorUI.name}
</button>
</li>`,

2
src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.ts
View File

@@ -84,7 +84,7 @@ export class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement im
property-editor-schema-alias=${this._propertyEditorSchemaAlias}
standalone>
${this._propertyEditorUiIcon
? html` <uui-icon name="${this._propertyEditorUiIcon}" slot="icon"></uui-icon> `
? html` <umb-icon name="${this._propertyEditorUiIcon}" slot="icon"></umb-icon> `
: ''}
<uui-action-bar slot="actions">
<uui-button label="Change" @click=${this.#openPropertyEditorUIPicker}></uui-button>

2
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts
View File

@@ -196,7 +196,7 @@ export class UmbInputDocumentTypeElement extends FormControlMixin(UmbLitElement)
#renderIcon(item: UmbDocumentTypeItemModel) {
if (!item.icon) return;
return html`<uui-icon slot="icon" name=${item.icon}></uui-icon>`;
return html`<umb-icon slot="icon" name=${item.icon}></umb-icon>`;
}
static styles = [

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts
View File

@@ -125,7 +125,7 @@ export class UmbCreateDocumentCollectionActionElement extends UmbLitElement {
this._allowedDocumentTypes,
(item) => html`
<uui-menu-item label=${item.name} href=${this.#getCreateUrl(item)}>
<uui-icon slot="icon" name=${item.icon ?? 'icon-document'}></uui-icon>
<umb-icon slot="icon" name=${item.icon ?? 'icon-document'}></umb-icon>
</uui-menu-item>
`,
)}

5
src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.ts
View File

@@ -112,7 +112,7 @@ export class UmbDocumentGridCollectionViewElement extends UmbLitElement {
@open=${() => this.#onOpen(item.unique ?? '')}
@selected=${() => this.#onSelect(item)}
@deselected=${() => this.#onDeselect(item)}>
<uui-icon slot="icon" name=${item.icon}></uui-icon>
<umb-icon slot="icon" name=${item.icon}></umb-icon>
${this.#renderState(item)} ${this.#renderProperties(sortOrder, item)}
</uui-card-content-node>
`;
@@ -151,7 +151,8 @@ export class UmbDocumentGridCollectionViewElement extends UmbLitElement {
${repeat(
this._userDefinedProperties,
(column) => column.alias,
(column) => html`<li><span>${column.header}:</span> ${getPropertyValueByAlias(sortOrder, item, column.alias)}</li>`,
(column) =>
html`<li><span>${column.header}:</span> ${getPropertyValueByAlias(sortOrder, item, column.alias)}</li>`,
)}
</ul>
`;

5
src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts
View File

@@ -190,11 +190,10 @@ export class UmbInputDocumentRootPickerElement extends FormControlMixin(UmbLitEl
if (!this.#dynamicRootOrigin) return;
return html`
<uui-ref-node
border
standalone
name=${this.#dynamicRootOrigin.label}
detail=${ifDefined(this.#dynamicRootOrigin.description)}>
<uui-icon slot="icon" name=${ifDefined(this.#dynamicRootOrigin.icon)}></uui-icon>
<umb-icon slot="icon" name=${ifDefined(this.#dynamicRootOrigin.icon)}></umb-icon>
<uui-action-bar slot="actions">
<uui-button
@click=${this.#openDynamicRootOriginPicker}
@@ -225,7 +224,7 @@ export class UmbInputDocumentRootPickerElement extends FormControlMixin(UmbLitEl
const step = this.#getQueryStepMeta(item);
return html`
<uui-ref-node standalone id=${step.unique} name=${step.label} detail="${ifDefined(step.description)}">
<uui-icon slot="icon" name=${step.icon}></uui-icon>
<umb-icon slot="icon" name=${step.icon}></umb-icon>
<uui-action-bar slot="actions">
<uui-button
@click=${() => this.#removeDynamicRootQueryStep(item)}

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts
View File

@@ -202,7 +202,7 @@ export class UmbInputDocumentElement extends FormControlMixin(UmbLitElement) {
#renderIcon(item: UmbDocumentItemModel) {
if (!item.documentType.icon) return;
return html`<uui-icon slot="icon" name=${item.documentType.icon}></uui-icon>`;
return html`<umb-icon slot="icon" name=${item.documentType.icon}></umb-icon>`;
}
#renderIsTrashed(item: UmbDocumentItemModel) {

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts
View File

@@ -137,7 +137,7 @@ export class UmbPermissionsModalElement extends UmbLitElement {
.userPermissionAliases=${userGroup.permissions}
@open=${() => this.#openUserPermissionsModal(userGroup.id)}
standalone>
${userGroup.icon ? html`<uui-icon slot="icon" name=${userGroup.icon}></uui-icon>` : nothing}
${userGroup.icon ? html`<umb-icon slot="icon" name=${userGroup.icon}></umb-icon>` : nothing}
</umb-user-group-ref>`,
)}
</uui-ref-list>

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts
View File

@@ -32,7 +32,7 @@ export class UmbDocumentTreeItemElement extends UmbLitElement implements UmbTree
<span id="icon-container" slot="icon">
${this.item?.documentType.icon
? html`
<uui-icon id="icon" slot="icon" name="${this.item.documentType.icon}"></uui-icon>
<umb-icon id="icon" slot="icon" name="${this.item.documentType.icon}"></umb-icon>
<span id="status-symbol"></span>
`
: nothing}

2
src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts
View File

@@ -144,7 +144,7 @@ export class UmbInputMediaTypeElement extends FormControlMixin(UmbLitElement) {
#renderIcon(item: UmbMediaTypeItemModel) {
if (!item.icon) return;
return html`<uui-icon slot="icon" name=${item.icon}></uui-icon>`;
return html`<umb-icon slot="icon" name=${item.icon}></umb-icon>`;
}
static styles = [

2
src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts
View File

@@ -122,7 +122,7 @@ export class UmbCreateMediaCollectionActionElement extends UmbLitElement {
this._allowedMediaTypes,
(item) => html`
<uui-menu-item label=${item.name} href=${this.#getCreateUrl(item)}>
<uui-icon slot="icon" name=${item.icon ?? 'icon-picture'}></uui-icon>
<umb-icon slot="icon" name=${item.icon ?? 'icon-picture'}></umb-icon>
</uui-menu-item>
`,
)}

2
src/Umbraco.Web.UI.Client/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts
View File

@@ -148,7 +148,7 @@ export class UmbInputMemberTypeElement extends FormControlMixin(UmbLitElement) {
#renderIcon(item: MemberTypeItemResponseModel) {
if (!item.icon) return;
return html`<uui-icon slot="icon" name=${item.icon}></uui-icon>`;
return html`<umb-icon slot="icon" name=${item.icon}></umb-icon>`;
}
static styles = [

2
src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts
View File

@@ -98,7 +98,7 @@ export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement {
version="${ifDefined(this.version ?? undefined)}"
@open=${this._onConfigure}
?disabled="${!this._packageView}">
${this.customIcon ? html`<uui-icon slot="icon" name="${this.customIcon}"></uui-icon>` : nothing}
${this.customIcon ? html`<umb-icon slot="icon" name="${this.customIcon}"></umb-icon>` : nothing}
<div slot="tag">
${this.hasPendingMigrations
? html`<uui-button

2
src/Umbraco.Web.UI.Client/src/packages/search/search-modal/search-modal.element.ts
View File

@@ -118,7 +118,7 @@ export class UmbSearchModalElement extends LitElement {
return html`
<a href="${item.href}" class="item">
<span class="item-icon">
${item.icon ? html`<uui-icon name="${item.icon}"></uui-icon>` : this.#renderHashTag()}
${item.icon ? html`<umb-icon name="${item.icon}"></umb-icon>` : this.#renderHashTag()}
</span>
<span class="item-name">
${item.name} ${item.url ? html`<span class="item-url">${item.url}</span>` : nothing}

2
src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts
View File

@@ -252,7 +252,7 @@ export default class UmbTemplateQueryBuilderModalElement extends UmbModalBaseEle
${this._templateQuery?.executionTime ?? 0} ms
</span>
${this._templateQuery?.sampleResults.map(
(sample) => html`<span><uui-icon name=${sample.icon}></uui-icon>${sample.name}</span>`,
(sample) => html`<span><umb-icon name=${sample.icon}></umb-icon>${sample.name}</span>`,
) ?? ''}
</div>
<umb-code-block language="C#" copy>${this._templateQuery?.queryExpression ?? ''}</umb-code-block>

2
src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts
View File

@@ -115,7 +115,7 @@ export class UmbUserGroupInputElement extends FormControlMixin(UmbLitElement) {
if (!item.unique) return;
return html`
<umb-user-group-ref name="${ifDefined(item.name)}">
${item.icon ? html`<uui-icon slot="icon" name=${item.icon}></uui-icon>` : nothing}
${item.icon ? html`<umb-icon slot="icon" name=${item.icon}></umb-icon>` : nothing}
<uui-action-bar slot="actions">
<uui-button @click=${() => this.#pickerContext.requestRemoveItem(item.unique)} label="Remove ${item.name}"

2
src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts
View File

@@ -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)}>
<uui-icon .name=${item.icon || null} slot="icon"></uui-icon>
<umb-icon .name=${item.icon || undefined} slot="icon"></umb-icon>
</uui-menu-item>
`,
)}