From a41505f8a0c019a2321f417ba5b878028bd693eb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 4 Oct 2021 14:45:51 +0100
Subject: [PATCH 1/3] Rename primary color to accent color

---
 .../src/components/design/AppPreview/ThemeEditor.svelte       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
index ac70fb9b29..7b36de4fa8 100644
--- a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
+++ b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
@@ -84,7 +84,7 @@
         </div>
       </div>
       <div class="setting">
-        <Label size="L">Primary color</Label>
+        <Label size="L">Accent color</Label>
         <ColorPicker
           spectrumTheme={$store.theme}
           value={$store.customTheme?.primaryColor || defaultTheme.primaryColor}
@@ -92,7 +92,7 @@
         />
       </div>
       <div class="setting">
-        <Label size="L">Primary color (hover)</Label>
+        <Label size="L">Accent color (hover)</Label>
         <ColorPicker
           spectrumTheme={$store.theme}
           value={$store.customTheme?.primaryColorHover ||

From b45777bd66fb687f782ea9ac9485b2ea1238df0f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 4 Oct 2021 14:50:02 +0100
Subject: [PATCH 2/3] Update svelte-flatpickr and disable flatpickr attempting
 to use native datepickers on mobile, to fix mobile support

---
 packages/bbui/package.json                    | 2 +-
 packages/bbui/src/Form/Core/DatePicker.svelte | 1 +
 packages/bbui/yarn.lock                       | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 5d1c98dd0c..53220fe02a 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -78,7 +78,7 @@
     "@spectrum-css/underlay": "^2.0.9",
     "@spectrum-css/vars": "^3.0.1",
     "dayjs": "^1.10.4",
-    "svelte-flatpickr": "^3.1.0",
+    "svelte-flatpickr": "^3.2.3",
     "svelte-portal": "^1.0.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 2516cb659d..176db9f497 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -26,6 +26,7 @@
     altFormat: enableTime ? "F j Y, H:i" : "F j, Y",
     wrap: true,
     appendTo,
+    disableMobile: "true",
   }
 
   const handleChange = event => {
diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock
index a3b20aa862..a492c83266 100644
--- a/packages/bbui/yarn.lock
+++ b/packages/bbui/yarn.lock
@@ -2415,10 +2415,10 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-svelte-flatpickr@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.1.0.tgz#ad83588430dbd55196a1a258b8ba27e7f9c1ee37"
-  integrity sha512-zKyV+ukeVuJ8CW0Ing3T19VSekc4bPkou/5Riutt1yATrLvSsanNqcgqi7Q5IePvIoOF9GJ5OtHvn1qK9Wx9BQ==
+svelte-flatpickr@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8"
+  integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw==
   dependencies:
     flatpickr "^4.5.2"
 

From 32d79e38e02155d2de03e65514a8c88c73c5c98b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 4 Oct 2021 15:49:06 +0100
Subject: [PATCH 3/3] Update self-host upgrade text

---
 .../src/components/upgrade/UpgradeModal.svelte       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/upgrade/UpgradeModal.svelte b/packages/builder/src/components/upgrade/UpgradeModal.svelte
index 570dcc06a1..9ceef1ddf8 100644
--- a/packages/builder/src/components/upgrade/UpgradeModal.svelte
+++ b/packages/builder/src/components/upgrade/UpgradeModal.svelte
@@ -21,12 +21,12 @@
   <ModalContent
     size="M"
     {onConfirm}
-    title="Upgrade to self-hosted"
-    confirmText="Upgrade"
+    title="Self-host Budibase"
+    confirmText="Self-host Budibase"
   >
-    <span
-      >Upgrade to Budibase self-hosting for free, and get SSO, unlimited apps,
-      and more - and it only takes a few minutes!</span
-    >
+    <span>
+      Self-host Budibase for free, and get SSO, unlimited apps, and more - and
+      it only takes a few minutes!
+    </span>
   </ModalContent>
 </Modal>