From e103e6b85b3e4a52a2b6a553fdee12fec56bc904 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 30 Oct 2023 10:52:21 +0000 Subject: [PATCH 1/9] Use new branding in error fallback page --- hosting/proxy/error.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hosting/proxy/error.html b/hosting/proxy/error.html index 023c1ebaff..ab322277d5 100644 --- a/hosting/proxy/error.html +++ b/hosting/proxy/error.html @@ -127,14 +127,16 @@ border: none; } .hero { - height: 160px; - width: 160px; - margin-right: 80px; + height: 72px; + margin-right: 40px; + } + .hero img { + height: 100%; } .content { display: flex; flex-direction: row; - align-items: flex-end; + align-items: center; justify-content: center; } @@ -152,7 +154,7 @@
- Budibase Logo + Budibase Logo
From 3162d45c5e7708df1b0f0a2db42c631d8e4af074 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Oct 2023 09:48:19 +0000 Subject: [PATCH 2/9] Update error page again --- hosting/proxy/error.html | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/hosting/proxy/error.html b/hosting/proxy/error.html index ab322277d5..545d6c7f6d 100644 --- a/hosting/proxy/error.html +++ b/hosting/proxy/error.html @@ -57,8 +57,8 @@ --spectrum-global-color-gray-600: rgb(144,144,144); --spectrum-global-color-gray-900: rgb(255,255,255); --spectrum-global-color-gray-800: rgb(227,227,227); - --spectrum-global-color-static-blue-600: rgb(20,115,230); - --spectrum-global-color-static-blue-hover: rgb( 18, 103, 207); + --bb-indigo: #6E56FF; + --bb-indigo-light: #9F8FFF; } html, body { @@ -90,15 +90,8 @@ .info { display: flex; flex-direction: column; - align-items: left; + align-items: flex-start; } - - @media only screen and (max-width: 600px) { - .info { - align-items: center; - } - } - .status { color: var(--spectrum-global-color-gray-600) } @@ -113,13 +106,14 @@ .buttons { display: flex; flex-direction: row; + justify-content: flex-start; margin-top: 15px; } .homeButton { - background-color: var(--spectrum-global-color-static-blue-600); + background-color: var(--bb-indigo); } .homeButton:hover { - background-color: var(--spectrum-global-color-static-blue-hover); + background-color: var(--bb-indigo-light); } .statusButton { background-color: transparent; @@ -127,8 +121,8 @@ border: none; } .hero { - height: 72px; - margin-right: 40px; + height: 60px; + margin: 10px 40px 10px 0; } .hero img { height: 100%; @@ -138,11 +132,19 @@ flex-direction: row; align-items: center; justify-content: center; + padding: 0 40px; + } + h1 { + margin-bottom: 10px; + } + h3 { + margin-top: 0; } @media only screen and (max-width: 600px) { .content { flex-direction: column; + align-items: flex-start; } } @@ -158,12 +160,11 @@
-

+

 

Houston we have a problem!

-

-

+

 

From 8c6365d2a3ca61b5d505745a2b3d14cf48d64a8c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Oct 2023 10:43:10 +0000 Subject: [PATCH 3/9] Add brand colour variables --- packages/bbui/src/bbui.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/bbui/src/bbui.css b/packages/bbui/src/bbui.css index 343aa77b27..9b5d89f61c 100644 --- a/packages/bbui/src/bbui.css +++ b/packages/bbui/src/bbui.css @@ -2,6 +2,15 @@ --background: #ffffff; --ink: #000000; + /* Brand colours */ + --bb-coral: #FF4E4E; + --bb-coral-light: #F97777; + --bb-indigo: #6E56FF; + --bb-indigo-light: #9F8FFF; + --bb-lime: #ECFFB5; + --bb-forest-green: #053835; + --bb-beige: #F6EFEA; + --grey-1: #fafafa; --grey-2: #f5f5f5; --grey-3: #eeeeee; From d9bce880ecffad25e42535a277bde8a1a4d4f44b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Oct 2023 10:58:32 +0000 Subject: [PATCH 4/9] Update BB logo across product --- packages/builder/assets/bb-emblem.svg | 89 ++---------- packages/builder/assets/bb-space-black.svg | 18 --- packages/builder/assets/bb-space-purple.svg | 25 ---- packages/builder/public/bblogo.png | Bin 787 -> 3966 bytes .../DatasourceNavigator/icons/Budibase.svelte | 134 +++--------------- 5 files changed, 33 insertions(+), 233 deletions(-) delete mode 100644 packages/builder/assets/bb-space-black.svg delete mode 100644 packages/builder/assets/bb-space-purple.svg diff --git a/packages/builder/assets/bb-emblem.svg b/packages/builder/assets/bb-emblem.svg index 7d499e4862..26d09cc97f 100644 --- a/packages/builder/assets/bb-emblem.svg +++ b/packages/builder/assets/bb-emblem.svg @@ -1,80 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/packages/builder/assets/bb-space-black.svg b/packages/builder/assets/bb-space-black.svg deleted file mode 100644 index fa1743f90c..0000000000 --- a/packages/builder/assets/bb-space-black.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/builder/assets/bb-space-purple.svg b/packages/builder/assets/bb-space-purple.svg deleted file mode 100644 index ccfb8b220d..0000000000 --- a/packages/builder/assets/bb-space-purple.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/builder/public/bblogo.png b/packages/builder/public/bblogo.png index 8c89c12f19762f94ae12a8a14291eaae1937e138..aa5ee4466e23c768dbb6c77167c93a63784a91bd 100644 GIT binary patch literal 3966 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 diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/Budibase.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/Budibase.svelte index 012f54da89..afbdccd2b0 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/Budibase.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/Budibase.svelte @@ -4,123 +4,33 @@ - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - + + + + + From e8f5980905af428302db90bb44766bd22d746ef6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Oct 2023 11:13:19 +0000 Subject: [PATCH 5/9] Update images in emails, readme and a few other usages --- README.md | 2 +- i18n/README.de.md | 2 +- i18n/README.es.md | 2 +- i18n/README.fr.md | 2 +- i18n/README.id.md | 2 +- i18n/README.jp.md | 2 +- i18n/README.zh.md | 2 +- .../portal/apps/onboarding/_components/PanelHeader.svelte | 6 +----- .../client/src/components/app/deprecated/Navigation.svelte | 3 --- packages/worker/src/constants/templates/core.hbs | 2 +- 10 files changed, 9 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 7827d4e48a..35b84a8816 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/i18n/README.de.md b/i18n/README.de.md index a2f4c3afb9..17d3d1ebbe 100644 --- a/i18n/README.de.md +++ b/i18n/README.de.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/i18n/README.es.md b/i18n/README.es.md index 21eb8caef7..227d5d5d5f 100644 --- a/i18n/README.es.md +++ b/i18n/README.es.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/i18n/README.fr.md b/i18n/README.fr.md index 12abd4d073..f5f9fbb25e 100644 --- a/i18n/README.fr.md +++ b/i18n/README.fr.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/i18n/README.id.md b/i18n/README.id.md index d4a25f569c..c2077f3922 100644 --- a/i18n/README.id.md +++ b/i18n/README.id.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/i18n/README.jp.md b/i18n/README.jp.md index 6fea497d53..62d0b1d3aa 100644 --- a/i18n/README.jp.md +++ b/i18n/README.jp.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/i18n/README.zh.md b/i18n/README.zh.md index 7e4dffd387..a6a9575029 100644 --- a/i18n/README.zh.md +++ b/i18n/README.zh.md @@ -1,6 +1,6 @@

- Budibase + Budibase

diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte index 34d612dc9e..49b8032726 100644 --- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte @@ -8,11 +8,7 @@
- +
{#if onBack}