From 2820b6adef009d7e171e634f9343ba452247956c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 10 Sep 2021 15:13:48 +0100
Subject: [PATCH 1/3] Fix left navigation in layouts when on a tablet sized
 resolution

---
 packages/client/src/components/app/Layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index 09d9376a0b..b3ac59e8cf 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -62,7 +62,7 @@
 <div
   class="layout layout--{typeClass}"
   use:styleable={$component.styles}
-  class:desktop={!$context.device.mobile && !$context.device.tablet}
+  class:desktop={!$context.device.mobile}
   class:mobile={!!$context.device.mobile}
 >
   {#if typeClass !== "none"}

From cc0c0104fe99470d883e259490f9aff8c6eaa007 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 10 Sep 2021 16:36:43 +0100
Subject: [PATCH 2/3] Fix custom theme integration with date time field

---
 packages/client/src/components/CustomThemeWrapper.svelte      | 2 +-
 packages/client/src/components/app/forms/DateTimeField.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/CustomThemeWrapper.svelte b/packages/client/src/components/CustomThemeWrapper.svelte
index 39a4842f22..053c206572 100644
--- a/packages/client/src/components/CustomThemeWrapper.svelte
+++ b/packages/client/src/components/CustomThemeWrapper.svelte
@@ -2,7 +2,7 @@
   import { themeStore } from "stores"
 </script>
 
-<div style={$themeStore.customThemeCss}>
+<div style={$themeStore.customThemeCss} id="theme-root">
   <slot />
 </div>
 
diff --git a/packages/client/src/components/app/forms/DateTimeField.svelte b/packages/client/src/components/app/forms/DateTimeField.svelte
index 9bbfabaee9..298fff5a1c 100644
--- a/packages/client/src/components/app/forms/DateTimeField.svelte
+++ b/packages/client/src/components/app/forms/DateTimeField.svelte
@@ -56,7 +56,7 @@
       disabled={fieldState.disabled}
       error={fieldState.error}
       id={fieldState.fieldId}
-      appendTo={document.getElementById("app-root")}
+      appendTo={document.getElementById("theme-root")}
       {enableTime}
       {placeholder}
     />

From 796c65bf5c7f843c7fed13531272cdff9f68c73e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 10 Sep 2021 16:36:59 +0100
Subject: [PATCH 3/3] Fix 1px offset with left nav bar

---
 packages/client/src/components/app/Layout.svelte | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index b3ac59e8cf..9a7ce13220 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -301,6 +301,9 @@
     flex-direction: row;
     overflow: hidden;
   }
+  .desktop.layout--left .nav-wrapper {
+    border-bottom: none;
+  }
   .desktop.layout--left .main-wrapper {
     height: 100%;
     overflow: auto;