From f649c6e87336464dfe67fec7cab7c5467bdf4faa Mon Sep 17 00:00:00 2001 From: leekelleher Date: Wed, 21 Feb 2024 13:29:11 +0000 Subject: [PATCH] Revert "Merge pull request #1174 from umbraco/feature/split-panel" This reverts commit 214f857034cf4d5ab96893081343963608e41bc1, reversing changes made to 0915f33cdd66693410d80c85da912834d9cfbf65. --- .../.storybook/preview-head.html | 19 +- .../src/packages/core/components/index.ts | 1 - .../core/components/split-panel/index.ts | 3 - .../split-panel/split-panel.element.ts | 312 ------------------ .../split-panel/split-panel.stories.ts | 50 --- .../core/section/section-default.element.ts | 49 +-- .../document-workspace-split-view.element.ts | 42 +-- .../app-language-select.element.ts | 2 +- 8 files changed, 45 insertions(+), 433 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/components/split-panel/index.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/components/split-panel/split-panel.element.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/components/split-panel/split-panel.stories.ts diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview-head.html b/src/Umbraco.Web.UI.Client/.storybook/preview-head.html index 4f7d6b9265..8a6c9e645c 100644 --- a/src/Umbraco.Web.UI.Client/.storybook/preview-head.html +++ b/src/Umbraco.Web.UI.Client/.storybook/preview-head.html @@ -1,14 +1,14 @@ - `, -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts index 677ae379e0..859f69b3b7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts @@ -76,26 +76,24 @@ export class UmbSectionDefaultElement extends UmbLitElement implements UmbSectio render() { return html` - - ${this._sidebarApps && this._sidebarApps.length > 0 - ? html` - - - ${repeat( - this._sidebarApps, - (app) => app.alias, - (app) => app.component, - )} - - ` + ${this._sidebarApps && this._sidebarApps.length > 0 + ? html` + + + ${repeat( + this._sidebarApps, + (app) => app.alias, + (app) => app.component, + )} + + ` + : nothing} + + ${this._routes && this._routes.length > 0 + ? html`` : nothing} - - ${this._routes && this._routes.length > 0 - ? html`` - : nothing} - - - + + `; } @@ -111,19 +109,6 @@ export class UmbSectionDefaultElement extends UmbLitElement implements UmbSectio h3 { padding: var(--uui-size-4) var(--uui-size-8); } - - umb-split-panel { - --umb-split-panel-initial-position: 200px; - --umb-split-panel-start-min-width: 200px; - --umb-split-panel-start-max-width: 400px; - --umb-split-panel-end-min-width: 600px; - } - - @media only screen and (min-width: 800px) { - umb-split-panel { - --umb-split-panel-initial-position: 300px; - } - } `, ]; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts index 9c0b028ab1..54eff56560 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts @@ -34,26 +34,23 @@ export class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement { } render() { - if (!this._variants) return nothing; + return this._variants + ? html`
+ ${repeat( + this._variants, + (view) => + view.index + '_' + (view.culture ?? '') + '_' + (view.segment ?? '') + '_' + this._variants!.length, + (view) => html` + + `, + )} +
- return html`
- - ${repeat( - this._variants, - (view) => - view.index + '_' + (view.culture ?? '') + '_' + (view.segment ?? '') + '_' + this._variants!.length, - (view, index) => html` - - `, - )} - -
- - `; + ` + : nothing; } static styles = [ @@ -69,16 +66,11 @@ export class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement { } #splitViews { + display: flex; width: 100%; height: calc(100% - var(--umb-footer-layout-height)); } - umb-split-panel { - --umb-split-panel-start-min-width: 25%; - --umb-split-panel-end-min-width: 25%; - --umb-split-panel-divider-color: var(--uui-color-border); - } - #breadcrumbs { margin: 0 var(--uui-size-layout-1); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts index fc59163e59..6fcee8e0db 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts @@ -114,7 +114,7 @@ export class UmbAppLanguageSelectElement extends UmbLitElement { } #toggle { - width: 100%; + width: var(--umb-section-sidebar-width); text-align: left; background: none; border: none;