Skip to content

Commit 776a414

Browse files
authored
Merge pull request #2385 from umbraco/v15/bugfix/document-blueprint-alignment
Bug: Content Workspace Alignment
2 parents c5e1de4 + bb1c5db commit 776a414

File tree

79 files changed

+653
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+653
-417
lines changed

src/assets/lang/en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2633,5 +2633,5 @@ export default {
26332633
extGroup_interactive: 'Interactive elements',
26342634
extGroup_media: 'Embeds and media',
26352635
extGroup_structure: 'Content structure',
2636-
}
2636+
},
26372637
} as UmbLocalizationDictionary;

src/mocks/handlers/document/tree.handlers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { rest } = window.MockServiceWorker;
22
import { umbDocumentMockDb } from '../../data/document/document.db.js';
3-
import type { GetTreeDocumentAncestorsResponse } from '@umbraco-cms/backoffice/external/backend-api';
43
import { UMB_SLUG } from './slug.js';
4+
import type { GetTreeDocumentAncestorsResponse } from '@umbraco-cms/backoffice/external/backend-api';
55
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
66

77
export const treeHandlers = [

src/packages/block/block-grid/property-editors/block-grid-areas-config/property-editor-ui-block-grid-areas-config.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import type { UmbBlockGridTypeAreaType } from '../../index.js';
44
import { UmbBlockGridAreaTypeEntriesContext } from './block-grid-area-type-entries.context.js';
55
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
66
import { html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
7-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
7+
import type {
8+
UmbPropertyEditorUiElement,
9+
UmbPropertyEditorConfigCollection,
10+
} from '@umbraco-cms/backoffice/property-editor';
811
import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
9-
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
1012
import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
1113
import { incrementString } from '@umbraco-cms/backoffice/utils';
1214

src/packages/block/block-grid/property-editors/block-grid-column-span/property-editor-ui-block-grid-column-span.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import type { UmbBlockGridTypeColumnSpanOption } from '../../types.js';
22
import { html, customElement, property, css, state, repeat } from '@umbraco-cms/backoffice/external/lit';
3-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
4-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
53
import {
4+
type UmbPropertyEditorUiElement,
65
UmbPropertyValueChangeEvent,
76
type UmbPropertyEditorConfigCollection,
87
} from '@umbraco-cms/backoffice/property-editor';
8+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
99
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
1010

1111
@customElement('umb-property-editor-ui-block-grid-column-span')

src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import {
1111
ref,
1212
} from '@umbraco-cms/backoffice/external/lit';
1313
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
14-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
15-
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
14+
import type {
15+
UmbPropertyEditorUiElement,
16+
UmbPropertyEditorConfigCollection,
17+
} from '@umbraco-cms/backoffice/property-editor';
1618
import '../../components/block-grid-entries/index.js';
1719
import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
1820
import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';

src/packages/block/block-grid/property-editors/block-grid-group-configuration/property-editor-ui-block-grid-group-configuration.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { html, customElement, property, css } from '@umbraco-cms/backoffice/external/lit';
2-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
3-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
42
import {
3+
type UmbPropertyEditorUiElement,
54
UmbPropertyValueChangeEvent,
65
type UmbPropertyEditorConfigCollection,
76
} from '@umbraco-cms/backoffice/property-editor';
7+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
88
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
99
import { UmbId } from '@umbraco-cms/backoffice/id';
1010
import type { UmbBlockGridTypeGroupType } from '@umbraco-cms/backoffice/block-grid';

src/packages/block/block-grid/property-editors/block-grid-layout-stylesheet/property-editor-ui-block-grid-layout-stylesheet.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import type { UmbInputStaticFileElement } from '@umbraco-cms/backoffice/static-f
44

55
import '@umbraco-cms/backoffice/static-file';
66
import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
7-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
8-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
97
import {
8+
type UmbPropertyEditorUiElement,
109
UmbPropertyValueChangeEvent,
1110
type UmbPropertyEditorConfigCollection,
1211
} from '@umbraco-cms/backoffice/property-editor';
12+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
1313
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
1414
import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system';
1515
import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';

src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import type { UmbBlockTypeWithGroupKey, UmbInputBlockTypeElement } from '../../../block-type/index.js';
22
import '../../../block-type/components/input-block-type/index.js';
3-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
3+
import {
4+
type UmbPropertyEditorUiElement,
5+
UmbPropertyValueChangeEvent,
6+
type UmbPropertyEditorConfigCollection,
7+
} from '@umbraco-cms/backoffice/property-editor';
48
import {
59
html,
610
customElement,
@@ -11,10 +15,6 @@ import {
1115
css,
1216
ifDefined,
1317
} from '@umbraco-cms/backoffice/external/lit';
14-
import {
15-
UmbPropertyValueChangeEvent,
16-
type UmbPropertyEditorConfigCollection,
17-
} from '@umbraco-cms/backoffice/property-editor';
1818
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
1919
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
2020
import {

src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ import { UMB_BLOCK_LIST_PROPERTY_EDITOR_SCHEMA_ALIAS } from './manifests.js';
66
import { UmbLitElement, umbDestroyOnDisconnect } from '@umbraco-cms/backoffice/lit-element';
77
import { html, customElement, property, state, repeat, css, nothing } from '@umbraco-cms/backoffice/external/lit';
88
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
9-
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
10-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
9+
import type {
10+
UmbPropertyEditorConfigCollection,
11+
UmbPropertyEditorUiElement,
12+
} from '@umbraco-cms/backoffice/property-editor';
1113
import type { UmbNumberRangeValueType } from '@umbraco-cms/backoffice/models';
1214
import type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/router';
1315
import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter';

src/packages/block/block-list/property-editors/block-list-type-configuration/property-editor-ui-block-list-type-configuration.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import '../../../block-type/components/input-block-type/index.js';
22
import { UMB_BLOCK_LIST_TYPE } from '../../types.js';
33
import type { UmbBlockTypeBaseModel, UmbInputBlockTypeElement } from '@umbraco-cms/backoffice/block-type';
4-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
5-
import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
64
import {
5+
type UmbPropertyEditorUiElement,
76
UmbPropertyValueChangeEvent,
87
type UmbPropertyEditorConfigCollection,
98
} from '@umbraco-cms/backoffice/property-editor';
9+
import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
1010
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
1111
import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
1212
import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';

0 commit comments

Comments
 (0)