From 6c9127427c6c915044352bef10f158727c412fcd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:43:56 +0000
Subject: [PATCH 01/13] Fix issues with colours in app skeletons

---
 .../[screenId]/_components/AppPreview.svelte      |  4 ++--
 packages/builder/src/stores/builder/theme.js      | 15 ++++++++++-----
 packages/client/src/stores/theme.js               | 11 ++---------
 packages/frontend-core/src/utils/index.js         |  1 +
 packages/frontend-core/src/utils/theme.js         | 12 ++++++++++++
 5 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 packages/frontend-core/src/utils/theme.js

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 12d572ecc4..44394fa7ee 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -247,9 +247,9 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div class="component-container">
-  {#if loading}
+  {#if loading || true}
     <div
-      class={`loading ${$themeStore.theme}`}
+      class={`loading spectrum spectrum--medium ${$themeStore.baseTheme} ${$themeStore.theme}`}
       class:tablet={$previewStore.previewDevice === "tablet"}
       class:mobile={$previewStore.previewDevice === "mobile"}
     >
diff --git a/packages/builder/src/stores/builder/theme.js b/packages/builder/src/stores/builder/theme.js
index afdf3e9805..efa2609b97 100644
--- a/packages/builder/src/stores/builder/theme.js
+++ b/packages/builder/src/stores/builder/theme.js
@@ -1,5 +1,6 @@
 import { writable, get } from "svelte/store"
 import { API } from "api"
+import { getBaseTheme } from "@budibase/frontend-core"
 
 const INITIAL_THEMES_STATE = {
   theme: "",
@@ -12,11 +13,15 @@ export const themes = () => {
   })
 
   const syncAppTheme = app => {
-    store.update(state => ({
-      ...state,
-      theme: app.theme || "spectrum--light",
-      customTheme: app.customTheme,
-    }))
+    store.update(state => {
+      const theme = app.theme || "spectrum--light"
+      return {
+        ...state,
+        theme,
+        baseTheme: getBaseTheme(theme),
+        customTheme: app.customTheme,
+      }
+    })
   }
 
   const save = async (theme, appId) => {
diff --git a/packages/client/src/stores/theme.js b/packages/client/src/stores/theme.js
index 8877556f0c..50dad12fa4 100644
--- a/packages/client/src/stores/theme.js
+++ b/packages/client/src/stores/theme.js
@@ -1,7 +1,7 @@
 import { derived } from "svelte/store"
 import { appStore } from "./app"
 import { builderStore } from "./builder"
-import { Constants } from "@budibase/frontend-core"
+import { getBaseTheme } from "@budibase/frontend-core"
 
 // This is the good old acorn bug where having the word "g l o b a l" makes it
 // think that this is not ES6 compatible and starts throwing errors when using
@@ -29,13 +29,6 @@ const createThemeStore = () => {
       // Ensure theme is set
       theme = theme || defaultTheme
 
-      // Get base theme
-      let base =
-        Constants.Themes.find(x => `spectrum--${x.class}` === theme)?.base || ""
-      if (base) {
-        base = `spectrum--${base}`
-      }
-
       // Delete and nullish keys from the custom theme
       if (customTheme) {
         Object.entries(customTheme).forEach(([key, value]) => {
@@ -59,7 +52,7 @@ const createThemeStore = () => {
 
       return {
         theme,
-        baseTheme: base,
+        baseTheme: getBaseTheme(theme),
         customTheme,
         customThemeCss,
       }
diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js
index 98998b7f0e..6b79e1d040 100644
--- a/packages/frontend-core/src/utils/index.js
+++ b/packages/frontend-core/src/utils/index.js
@@ -7,3 +7,4 @@ export * as RowUtils from "./rows"
 export { memo, derivedMemo } from "./memo"
 export { createWebsocket } from "./websocket"
 export * from "./download"
+export * from "./theme"
diff --git a/packages/frontend-core/src/utils/theme.js b/packages/frontend-core/src/utils/theme.js
new file mode 100644
index 0000000000..165f7c9782
--- /dev/null
+++ b/packages/frontend-core/src/utils/theme.js
@@ -0,0 +1,12 @@
+import { Themes } from "../constants.js"
+
+export const getBaseTheme = theme => {
+  if (!theme) {
+    return ""
+  }
+  let base = Themes.find(x => `spectrum--${x.class}` === theme)?.base || ""
+  if (base) {
+    base = `spectrum--${base}`
+  }
+  return base
+}

From 884d9ecf6c9e6e6c98380140a55fbaa7a4e83245 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:45:23 +0000
Subject: [PATCH 02/13] Remove testing code

---
 .../design/[screenId]/_components/AppPreview.svelte             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 44394fa7ee..298f044086 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -247,7 +247,7 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div class="component-container">
-  {#if loading || true}
+  {#if loading}
     <div
       class={`loading spectrum spectrum--medium ${$themeStore.baseTheme} ${$themeStore.theme}`}
       class:tablet={$previewStore.previewDevice === "tablet"}

From dbaaa9beeefc604312c80a9b640eebf4bada73fd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:46:58 +0000
Subject: [PATCH 03/13] Remove redundant classes

---
 .../design/[screenId]/_components/AppPreview.svelte             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 298f044086..0ce9e096f2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -249,7 +249,7 @@
 <div class="component-container">
   {#if loading}
     <div
-      class={`loading spectrum spectrum--medium ${$themeStore.baseTheme} ${$themeStore.theme}`}
+      class={`loading ${$themeStore.baseTheme} ${$themeStore.theme}`}
       class:tablet={$previewStore.previewDevice === "tablet"}
       class:mobile={$previewStore.previewDevice === "mobile"}
     >

From 66009305598b142833a78cee77699cffba18f446 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 10:51:53 +0000
Subject: [PATCH 04/13] Fix annoying account-portal submodule check

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index f5b467b6b1..13b3bc93e1 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a
+Subproject commit 13b3bc93e115a2ec6c2cde5cfa199773e31a308d

From 00d57c7f0fc6e28ed0000321c954112fa0711f0d Mon Sep 17 00:00:00 2001
From: Gerard Burns <gjburns9@hotmail.com>
Date: Tue, 26 Mar 2024 11:06:09 +0000
Subject: [PATCH 05/13] add base theme to portal app preview

---
 .../src/pages/builder/portal/apps/[appId]/index.svelte      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
index a08189a400..d7e0e35289 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
@@ -20,7 +20,7 @@
   import { sdk } from "@budibase/shared-core"
   import { API } from "api"
   import ErrorSVG from "./ErrorSVG.svelte"
-  import { ClientAppSkeleton } from "@budibase/frontend-core"
+  import { getBaseTheme, ClientAppSkeleton } from "@budibase/frontend-core"
 
   $: app = $enrichedApps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
@@ -137,7 +137,9 @@
       class:hide={!loading || !app?.features?.skeletonLoader}
       class="loading"
     >
-      <div class={`loadingThemeWrapper ${app.theme}`}>
+      <div
+        class={`loadingThemeWrapper ${getBaseTheme(app.theme)} ${app.theme}`}
+      >
         <ClientAppSkeleton
           noAnimation
           hideDevTools={app?.status === "published"}

From 84ffaa7022c3ef7de77a40ca2aff1572e1d05026 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 26 Mar 2024 14:47:14 +0000
Subject: [PATCH 06/13] Fix additional scrollbar appearing when hiding binding
 panels

---
 .../builder/src/components/common/bindings/BindingPanel.svelte   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 21d389357f..10d95a3e7e 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -371,6 +371,7 @@
 <style>
   .binding-panel {
     height: 100%;
+    overflow: hidden;
   }
   .binding-panel,
   .tabs {

From ad89bb970c895346043698e5b065e827e85a043e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 27 Mar 2024 09:31:22 +0000
Subject: [PATCH 07/13] Update account portal

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 13b3bc93e1..08073bf33e 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 13b3bc93e115a2ec6c2cde5cfa199773e31a308d
+Subproject commit 08073bf33efc6f232846d11c58e40fdd20f0b4a3

From 0a4eddc7dcc21663a57f3bdf0e97da8c27195410 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 27 Mar 2024 10:20:22 +0000
Subject: [PATCH 08/13] Try reverting account portal

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 08073bf33e..f5b467b6b1 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 08073bf33efc6f232846d11c58e40fdd20f0b4a3
+Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a

From d3fdf4add8488d9cb812d16c332c17641c9f7bf8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:37:13 +0100
Subject: [PATCH 09/13] Runs checks only if you changed it

---
 .github/workflows/budibase_ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 36ea2f5448..1a4ad5e1be 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -264,7 +264,15 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Check account portal commit
+      - uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            src:
+              - packages/account-portal/**
+
+      - if: steps.changes.outputs.changes.src == 'true'
+        name: Check account portal commit
         id: get_accountportal_commits
         run: |
           cd packages/account-portal

From e0bb5f323f197682c851c3c70c7d223fb12749e3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:41:02 +0100
Subject: [PATCH 10/13] Update submodule

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index f5b467b6b1..eb5315adb5 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a
+Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75

From f1dfc16e1cd5a7660790ddd126ce25031a695433 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:44:32 +0100
Subject: [PATCH 11/13] Fix

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 1a4ad5e1be..5a0d09033a 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -271,7 +271,7 @@ jobs:
             src:
               - packages/account-portal/**
 
-      - if: steps.changes.outputs.changes.src == 'true'
+      - if: steps.changes.outputs.src == 'true'
         name: Check account portal commit
         id: get_accountportal_commits
         run: |

From 7938c006647622cc4900075c1b0a8e793092d3a9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:46:51 +0100
Subject: [PATCH 12/13] Submodule not latest

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index eb5315adb5..bf3f8e3127 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit eb5315adb5c0023a340d8e1c1009ec667566ce75
+Subproject commit bf3f8e3127d2f362884d76ff49f62daae45eb19f

From 2998bf094ac0b06a668aa5c35e4a8405a4fcb779 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 27 Mar 2024 11:48:46 +0100
Subject: [PATCH 13/13] Undo changes

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index bf3f8e3127..f5b467b6b1 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit bf3f8e3127d2f362884d76ff49f62daae45eb19f
+Subproject commit f5b467b6b1c55c48847545db41be7b1c035e167a