diff --git a/packages/builder/src/nav/BackendNav.svelte b/packages/builder/src/nav/BackendNav.svelte index 6b78842f40..77cdc76480 100644 --- a/packages/builder/src/nav/BackendNav.svelte +++ b/packages/builder/src/nav/BackendNav.svelte @@ -1,44 +1,41 @@ + +
+ +
+ + diff --git a/packages/builder/src/nav/UsersList.svelte b/packages/builder/src/nav/UsersList.svelte new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/userInterface/UserInterfaceRoot.svelte index ebb78d98e9..18ad131923 100644 --- a/packages/builder/src/userInterface/UserInterfaceRoot.svelte +++ b/packages/builder/src/userInterface/UserInterfaceRoot.svelte @@ -126,7 +126,6 @@ flex-direction: column; } -<<<<<<< HEAD .preview-pane { grid-column: 2; margin: 40px; @@ -135,8 +134,6 @@ box-shadow: 0 0px 6px rgba(0, 0, 0, 0.05); } -======= ->>>>>>> new backend beginnings .components-pane { grid-column: 3; background-color: var(--secondary5);