diff --git a/packages/builder/src/components/userInterface/SettingsView.svelte b/packages/builder/src/components/userInterface/SettingsView.svelte index eee50d8cf6..211e04d009 100644 --- a/packages/builder/src/components/userInterface/SettingsView.svelte +++ b/packages/builder/src/components/userInterface/SettingsView.svelte @@ -41,7 +41,7 @@ { key: "layoutId", label: "Layout", control: LayoutSelect }, ] - const layoutDefinition = [{ key: "title", label: "Title", control: Input }] + const layoutDefinition = [] const canRenderControl = (key, dependsOn) => { let test = !isEmpty(componentInstance[dependsOn]) @@ -119,7 +119,7 @@ {/if} {/if} - {#if panelDefinition && panelDefinition.length > 0} + {#if !isLayout && panelDefinition && panelDefinition.length > 0} {#each panelDefinition as definition} {#if canRenderControl(definition.key, definition.dependsOn)} element.doc.layoutId) if (layoutsUsedByScreens.includes(layoutId)) { - ctx.throw(400, "Cannot delete a base layout") + ctx.throw(400, "Cannot delete a layout that's being used by a screen") } await db.remove(layoutId, layoutRev) diff --git a/packages/server/src/constants/layouts.js b/packages/server/src/constants/layouts.js index f2ad5b2675..0b25bf52a9 100644 --- a/packages/server/src/constants/layouts.js +++ b/packages/server/src/constants/layouts.js @@ -16,7 +16,17 @@ const EMPTY_LAYOUT = { _id: "7fcf11e4-6f5b-4085-8e0d-9f3d44c98967", _component: "##builtin/screenslot", _styles: { - normal: {}, + normal: { + flex: "1 1 auto", + display: "flex", + "flex-direction": "column", + "justify-content": "flex-start", + "align-items": "stretch", + "max-width": "100%", + "margin-left": "20px", + "margin-right": "20px", + width: "1400px", + }, hover: {}, active: {}, selected: {}, @@ -28,7 +38,16 @@ const EMPTY_LAYOUT = { _styles: { active: {}, hover: {}, - normal: {}, + normal: { + display: "flex", + "flex-direction": "column", + "align-items": "center", + "justify-content": "flex-start", + "margin-right": "auto", + "margin-left": "auto", + "min-height": "100%", + "background-image": "#f5f5f5", + }, selected: {}, }, className: "",