From e3f4e5525e3d75a4518387b118f0717a4425414f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 5 Aug 2024 13:34:38 +0100 Subject: [PATCH] Fix background color on grid underlay and ensure screens with grids default to 24x24 --- packages/client/src/components/Screen.svelte | 5 +++-- .../src/components/app/container/GridContainer.svelte | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/Screen.svelte b/packages/client/src/components/Screen.svelte index ac0af9f3b2..3c8fcf97e3 100644 --- a/packages/client/src/components/Screen.svelte +++ b/packages/client/src/components/Screen.svelte @@ -13,8 +13,9 @@ const onLoadActions = memo() // Get the screen definition for the current route - $: screenDefinition = $screenStore.activeScreen?.props - $: onLoadActions.set($screenStore.activeScreen?.onLoad) + $: screen = $screenStore.activeScreen + $: screenDefinition = { cols: 24, rows: 24, ...screen?.props } + $: onLoadActions.set(screen?.onLoad) $: runOnLoadActions($onLoadActions, params) // Enrich and execute any on load actions. diff --git a/packages/client/src/components/app/container/GridContainer.svelte b/packages/client/src/components/app/container/GridContainer.svelte index b16fc88dbf..e625cff834 100644 --- a/packages/client/src/components/app/container/GridContainer.svelte +++ b/packages/client/src/components/app/container/GridContainer.svelte @@ -81,15 +81,16 @@ left: 0; width: 100%; height: 100%; - grid-gap: 2px; - background-color: var(--spectrum-global-color-gray-200); - border: 2px solid var(--spectrum-global-color-gray-200); + /* grid-gap: 2px;*/ + /* background-color: var(--spectrum-global-color-gray-200);*/ + border: 1px solid var(--spectrum-global-color-gray-200); } .underlay { z-index: -1; } .placeholder { - background-color: var(--spectrum-global-color-gray-100); + /* background-color: var(--spectrum-global-color-gray-100);*/ + border: 1px solid var(--spectrum-global-color-gray-200); } /* Ensure all top level children have grid styles applied */