diff --git a/lerna.json b/lerna.json index f1d711e915..cb0b8dcc26 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.16-alpha.2", + "version": "2.7.19", "npmClient": "yarn", "packages": [ "packages/backend-core", @@ -31,4 +31,4 @@ "loadEnvFiles": false } } -} \ No newline at end of file +} diff --git a/packages/builder/index.html b/packages/builder/index.html index 96abc8e582..eb151de75c 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -5,9 +5,10 @@ Budibase - - + + + + diff --git a/packages/builder/package.json b/packages/builder/package.json index 73bc003343..a2567dc638 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -70,6 +70,7 @@ "@codemirror/state": "^6.2.0", "@codemirror/theme-one-dark": "^6.1.2", "@codemirror/view": "^6.11.2", + "@fontsource/source-sans-pro": "^5.0.3", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", @@ -122,6 +123,7 @@ "tsconfig-paths": "4.0.0", "typescript": "4.7.3", "vite": "^3.0.8", + "vite-plugin-static-copy": "^0.16.0", "vitest": "^0.29.2" }, "nx": { diff --git a/packages/builder/public/bblogo.png b/packages/builder/public/bblogo.png new file mode 100644 index 0000000000..8c89c12f19 Binary files /dev/null and b/packages/builder/public/bblogo.png differ diff --git a/packages/builder/src/pages/builder/Branding.svelte b/packages/builder/src/pages/builder/Branding.svelte index 142473abb8..e51ca1c70d 100644 --- a/packages/builder/src/pages/builder/Branding.svelte +++ b/packages/builder/src/pages/builder/Branding.svelte @@ -8,7 +8,7 @@ $: platformTitle = !$auth.user && platformTitleText ? platformTitleText : "Budibase" - $: faviconUrl = $organisation.faviconUrl || "https://i.imgur.com/Xhdt1YP.png" + $: faviconUrl = $organisation.faviconUrl || "/builder/bblogo.png" onMount(async () => { await organisation.init() @@ -27,6 +27,6 @@ {:else} - + {/if} diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte index 0b290decbf..48221a918d 100644 --- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte @@ -44,7 +44,7 @@
- Budibase Logo + Budibase Logo

{name}

Home
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index 7227551850..bf6b4ce17e 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -1,6 +1,7 @@ import { svelte } from "@sveltejs/vite-plugin-svelte" import replace from "@rollup/plugin-replace" import { defineConfig, loadEnv } from "vite" +import { viteStaticCopy } from "vite-plugin-static-copy" import path from "path" const ignoredWarnings = [ @@ -59,6 +60,18 @@ export default defineConfig(({ mode }) => { ), "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN), }), + viteStaticCopy({ + targets: [ + { + src: "../../node_modules/@fontsource/source-sans-pro", + dest: "fonts", + }, + { + src: "../../node_modules/remixicon/fonts/*", + dest: "fonts", + }, + ], + }), ], optimizeDeps: { exclude: ["@roxi/routify"], diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 244500f266..ba5bbedd2f 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -180,10 +180,7 @@ {/if}