diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 8fa02bb8f3..4a5ef890bf 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -32,11 +32,10 @@ export default function positionDropdown(element, opts) {
left: null,
top: null,
}
-
// Determine vertical styles
if (align === "right-outside") {
styles.top = anchorBounds.top
- } else if (window.innerHeight - anchorBounds.bottom < 100) {
+ } else if (window.innerHeight - anchorBounds.bottom < (maxHeight || 100)) {
styles.top = anchorBounds.top - elementBounds.height - offset
styles.maxHeight = maxHeight || 240
} else {
diff --git a/packages/bbui/src/ColorPicker/ColorPicker.svelte b/packages/bbui/src/ColorPicker/ColorPicker.svelte
index 9a70134fb6..2ba5309860 100644
--- a/packages/bbui/src/ColorPicker/ColorPicker.svelte
+++ b/packages/bbui/src/ColorPicker/ColorPicker.svelte
@@ -1,8 +1,8 @@
-
-
- {#if open}
-
+
{
+ dropdown.toggle()
+ }}
+>
+
+
+
+
+
+
{#each categories as category}
{category.label}
@@ -187,8 +184,8 @@
- {/if}
-
+
+
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ButtonRoundnessSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ButtonRoundnessSelect.svelte
new file mode 100644
index 0000000000..6e0fc39029
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ButtonRoundnessSelect.svelte
@@ -0,0 +1,38 @@
+
+
+
+
+
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/SettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
similarity index 78%
rename from packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/SettingsPanel.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
index e6200272be..a08ded8eee 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/SettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
@@ -1,10 +1,8 @@
-
-
- {#if $selectedScreen.layoutId}
-
- This screen uses a custom layout, which is deprecated
-
- {/if}
- {#each screenSettings as setting (setting.key)}
- setScreenSetting(setting, val)}
- props={{ ...setting.props, error: errors[setting.key] }}
- {bindings}
- />
- {/each}
-
-
+{#if $selectedScreen.layoutId}
+
+ This screen uses a custom layout, which is deprecated
+
+{/if}
+{#each screenSettings as setting (setting.key)}
+ setScreenSetting(setting, val)}
+ props={{ ...setting.props, error: errors[setting.key] }}
+ {bindings}
+ />
+{/each}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
new file mode 100644
index 0000000000..13a008fae0
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
@@ -0,0 +1,78 @@
+
+
+
+
+ These settings apply to all screens
+
+
+
+
+
+
+
+ update("buttonBorderRadius", e.detail)}
+ />
+
+ update("primaryColor", val)}
+ props={{
+ spectrumTheme: $store.theme,
+ }}
+ />
+ update("primaryColorHover", val)}
+ props={{
+ spectrumTheme: $store.theme,
+ }}
+ />
+
+
+
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
new file mode 100644
index 0000000000..778fa303cc
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
@@ -0,0 +1,51 @@
+
+
+
+
+
+ {#each tabs as tab}
+
{
+ activeTab = tab
+ }}
+ >
+ {capitalise(tab)}
+
+ {/each}
+
+
+
+ {#if activeTab === "theme"}
+
+ {:else}
+
+ {/if}
+
+
+
+
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
index 03a0aad9ba..19cb1d8dff 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
@@ -6,7 +6,7 @@
import { findComponent } from "builderStore/componentUtils"
import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
import NavigationPanel from "./_components/Navigation/index.svelte"
- import ScreenSettingsPanel from "./_components/Screen/SettingsPanel.svelte"
+ import ScreenSettingsPanel from "./_components/Screen/index.svelte"
$: componentId = $store.selectedComponentId
$: store.actions.websocket.selectResource(componentId)
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index f8b6bd6d16..bd5960e858 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -281,12 +281,7 @@ async function performAppCreate(ctx: UserCtx) {
title: name,
navWidth: "Large",
navBackground: "var(--spectrum-global-color-gray-100)",
- links: [
- {
- url: "/home",
- text: "Home",
- },
- ],
+ links: [],
},
theme: "spectrum--light",
customTheme: {