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

Merge remote-tracking branch 'origin/release/beta002'

Browse Source
This commit is contained in:
Jacob Overgaard
2024-03-19 16:39:43 +01:00
parent b781bcba8a a9a9008672
commit b966507b4b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon.registry.ts
View File

@@ -1,4 +1,5 @@
import icons from './icons/icons.json' with { type: 'json' };
// @ts-ignore
import icons from './icons/icons.json' assert { type: 'json' };
import { UUIIconRegistry } from '@umbraco-cms/backoffice/external/uui';
interface UmbIconDescriptor {

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/icon-picker/icon-picker-modal.element.ts
View File

@@ -1,4 +1,4 @@
import icons from '../../../icon-registry/icons/icons.json' with { type: 'json' };
import icons from '../../../icon-registry/icons/icons.json' assert { type: 'json' };
import type { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';