From c3b39d59530bd5bd0b26dc8e6b5ca04f02476911 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 May 2022 11:09:20 +0100 Subject: [PATCH] Fix theme resetting navigation background and update layout UI --- .../_components/LayoutListPanel.svelte | 36 ++++++++----------- .../_components/LayoutSettingsPanel.svelte | 10 +++++- .../theme/_components/AppThemeSelect.svelte | 7 ---- .../server/src/api/controllers/application.ts | 2 +- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte index 4379099725..b481280c28 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutListPanel.svelte @@ -1,31 +1,25 @@ - - {}} - > - Custom layouts are being deprecated. They will be removed on [date]. - + +
+ {#each $store.layouts as layout (layout._id)} + ($store.selectedLayoutId = layout._id)} + > + + + {/each} +
- {#each $store.layouts as layout (layout._id)} - ($store.selectedLayoutId = layout._id)} - > - - - {/each} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte index 77431c7038..8e1228d5ab 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -1,7 +1,7 @@