From eeb824af9494b71f79f2c0dab06ea5fbcf5f18fe Mon Sep 17 00:00:00 2001 From: JesmoDev Date: Wed, 25 May 2022 13:42:58 +0200 Subject: [PATCH] Revert "backoffice styling" This reverts commit 5a34a4120daa202c4f2f52dc1b80306766faef59. --- ....element.ts => backoffice-main.element.ts} | 48 +++++++++++-------- .../src/backoffice/backoffice.element.ts | 5 +- 2 files changed, 30 insertions(+), 23 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/{backoffice-content.element.ts => backoffice-main.element.ts} (58%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-content.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts similarity index 58% rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice-content.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts index 36f9e9b9ea..af915b7996 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-content.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-main.element.ts @@ -2,13 +2,17 @@ import { defineElement } from '@umbraco-ui/uui-base/lib/registration'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; -@defineElement('umb-backoffice-content') -export class UmbBackofficeContent extends LitElement { +@defineElement('umb-backoffice-main') +export class UmbBackofficeMain extends LitElement { static styles = [ UUITextStyles, css` :host { flex: 1 1 auto; + } + + // TODO: not call this editor, I would like to reserve that name for the view of editing data, like what goes in the router-outlet or in infinite editors (or inside Nested Content) + #editor { background-color: var(--uui-color-background); width: 100%; height: 100%; @@ -16,7 +20,7 @@ export class UmbBackofficeContent extends LitElement { flex-direction: column; } - #top-bar { + #editor-top { background-color: var(--uui-color-surface); width: 100%; display: flex; @@ -26,19 +30,19 @@ export class UmbBackofficeContent extends LitElement { border-bottom: 1px solid var(--uui-color-border); } - #top-bar uui-input { + #editor-top uui-input { width: 100%; margin-left: 16px; } - #top-bar uui-tab-group { + #editor-top uui-tab-group { --uui-tab-divider: var(--uui-color-border); border-left: 1px solid var(--uui-color-border); flex-wrap: nowrap; height: 60px; } - #content-content { + #editor-content { padding: var(--uui-size-6); display: flex; flex: 1; @@ -50,7 +54,7 @@ export class UmbBackofficeContent extends LitElement { font-size: 0.8rem; } - #bottom-bar { + #editor-bottom { display: flex; flex: none; justify-content: end; @@ -68,19 +72,21 @@ export class UmbBackofficeContent extends LitElement { render() { return html` -
- - - Content - Info - Actions - -
- -
- Save and preview - Save - Save and publish +
+
+ + + Content + Info + Actions + +
+ +
+ Save and preview + Save + Save and publish +
`; } @@ -88,6 +94,6 @@ export class UmbBackofficeContent extends LitElement { declare global { interface HTMLElementTagNameMap { - 'umb-backoffice-content': UmbBackofficeContent; + 'umb-backoffice-main': UmbBackofficeMain; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index e48230865b..7cbf619ba2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -1,6 +1,6 @@ import './backoffice-header.element'; import './backoffice-sidebar.element'; -import './backoffice-content.element'; +import './backoffice-main.element'; import { defineElement } from '@umbraco-ui/uui-base/lib/registration'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; @@ -29,6 +29,7 @@ export class UmbBackoffice extends LitElement { `, ]; + // TODO: main div and then side and main again within? I propose the backoffice-main begin renamed to something less main-ish. // TODO: I would think umb-backoffice-header would be outside the router outlet? so its always present. render() { @@ -36,7 +37,7 @@ export class UmbBackoffice extends LitElement {
- +
`; }