MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"Master Layout" > "Page Layout" .. and moved above screens

This commit is contained in:
Michael Shanks 2020-04-02 16:37:22 +01:00
parent 5ab43eba99
commit 2021f4466a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/builder/src/components/userInterface/MasterLayout.svelte → packages/builder/src/components/userInterface/PageLayout.svelte
View File

@ -52,22 +52,20 @@
<div>
<div
class="budibase__nav-item"
class="budibase__nav-item root"
class:selected={$store.currentComponentInfo._id === _layout.component.props._id}
on:click|stopPropagation={() => store.setScreenType('page')}>
<span
class="icon"
class:rotate={$store.currentPreviewItem.name !== _layout.title}>
{#if _layout.component.props._children.length}
<ArrowDownIcon />
{/if}
</span>
<span class="icon">
<GridIcon />
</span>
<span class="title">Master Layout</span>
<span class="title">Page Layout</span>
</div>
{#if $store.currentPreviewItem.name === _layout.title && _layout.component.props._children}
@ -90,6 +88,9 @@
onOk={() => store.deleteComponent(componentToDelete)} />
<style>
.root {
}
.title {
margin-left: 10px;
margin-top: 2px;

7
packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
View File

@ -1,7 +1,7 @@
<script>
import ComponentsHierarchy from "./ComponentsHierarchy.svelte"
import ComponentsHierarchyChildren from "./ComponentsHierarchyChildren.svelte"
import MasterLayout from "./MasterLayout.svelte"
import PageLayout from "./PageLayout.svelte"
import PagesList from "./PagesList.svelte"
import { store } from "builderStore"
import IconButton from "components/common/IconButton.svelte"
@ -55,6 +55,10 @@
<div class="border-line" />
<PageLayout layout={$store.pages[$store.currentPageName]} />
<div class="border-line" />
<div class="components-list-container">
<div class="nav-group-header">
<span class="components-nav-header" style="margin-top: 0;">
@ -67,7 +71,6 @@
</div>
</div>
<div class="nav-items-container">
<MasterLayout layout={$store.pages[$store.currentPageName]} />
<ComponentsHierarchy screens={$store.screens} />
</div>
</div>