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

manual merges

Browse Source
This commit is contained in:
Mads Rasmussen
2023-03-09 13:57:04 +01:00
parent 3c2a8679ca
commit e52dafc86f
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/libs/modal/index.ts
View File

@@ -1,4 +1,5 @@
export * from './modal.context';
export * from './modal-handler';
export * from './layouts/modal-layout.element';
export * from './layouts/modal-layout-picker-base';
export * from './token/modal-token';

2
src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/modals/language-picker/language-picker-modal.element.ts
View File

@@ -5,7 +5,7 @@ import { repeat } from 'lit-html/directives/repeat.js';
import { UUIMenuItemElement, UUIMenuItemEvent } from '@umbraco-ui/uui';
import { ifDefined } from 'lit-html/directives/if-defined.js';
import { UmbLanguageRepository } from '../../repository/language.repository';
import { UmbModalLayoutPickerBase } from '../../../../../../libs/modal/layouts/modal-layout-picker-base';
import { UmbModalLayoutPickerBase } from '@umbraco-cms/modal';
import { LanguageModel } from '@umbraco-cms/backend-api';
@customElement('umb-language-picker-modal')

6
src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/debug.modal.element.ts → src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/debug-modal.element.ts
View File

@@ -7,8 +7,8 @@ export interface UmbDebugModalData {
content: TemplateResult | string;
}
@customElement('umb-debug-modal-layout')
export default class UmbDebugModalLayout extends UmbModalLayoutElement<UmbDebugModalData> {
@customElement('umb-debug-modal')
export default class UmbDebugModalElement extends UmbModalLayoutElement<UmbDebugModalData> {
static styles = [
UUITextStyles,
css`
@@ -74,6 +74,6 @@ export default class UmbDebugModalLayout extends UmbModalLayoutElement<UmbDebugM
declare global {
interface HTMLElementTagNameMap {
'umb-debug-modal-layout': UmbDebugModalLayout;
'umb-debug-modal': UmbDebugModalElement;
}
}

0
src/Umbraco.Web.UI.Client/src/backoffice/shared/components/debug/modals/debug/index.ts Normal file
View File

2
src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts
View File

@@ -1,7 +1,7 @@
import { UUITextStyles } from '@umbraco-ui/uui-css';
import { css, html } from 'lit';
import { customElement, state } from 'lit/decorators.js';
import { UmbModalLayoutPickerBase } from '../../../../../libs/modal/layouts/modal-layout-picker-base';
import { UmbModalLayoutPickerBase } from '@umbraco-cms/modal';
import { umbExtensionsRegistry } from '@umbraco-cms/extensions-api';
import type { ManifestSection } from '@umbraco-cms/models';

4
src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
View File

@@ -55,9 +55,9 @@ export default {
'@umbraco-cms/utils': './libs/utils/index.ts',
'@umbraco-cms/test-utils': './libs/test-utils/index.ts',
'@umbraco-cms/resources': './libs/resources/index.ts',
'@umbraco-cms/repository': './libs/repository',
'@umbraco-cms/repository': './libs/repository/index.ts',
'@umbraco-cms/router': './libs/router/index.ts',
'@umbraco-cms/modal': './src/core/modal/index.ts',
'@umbraco-cms/modal': './libs/modal/index.ts',
},
},
},