diff --git a/packages/bbui/src/bbui.css b/packages/bbui/src/bbui.css index 3ff6d2f743..e84944389b 100644 --- a/packages/bbui/src/bbui.css +++ b/packages/bbui/src/bbui.css @@ -64,9 +64,9 @@ --rounded-medium: 8px; --rounded-large: 16px; - --font-sans: "Source Sans Pro", -apple-system, BlinkMacSystemFont, Segoe UI, + --font-sans: "Source Sans 3", -apple-system, BlinkMacSystemFont, Segoe UI, "Inter", "Helvetica Neue", Arial, "Noto Sans", sans-serif; - --font-accent: "Source Sans Pro", -apple-system, BlinkMacSystemFont, Segoe UI, + --font-accent: "Source Sans 3", -apple-system, BlinkMacSystemFont, Segoe UI, "Inter", "Helvetica Neue", Arial, "Noto Sans", sans-serif; --font-serif: "Georgia", Cambria, Times New Roman, Times, serif; --font-mono: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", diff --git a/packages/builder/assets/source-sans-3/SourceSans3VF-Italic.ttf.woff2 b/packages/builder/assets/source-sans-3/SourceSans3VF-Italic.ttf.woff2 new file mode 100644 index 0000000000..623db47714 Binary files /dev/null and b/packages/builder/assets/source-sans-3/SourceSans3VF-Italic.ttf.woff2 differ diff --git a/packages/builder/assets/source-sans-3/SourceSans3VF-Upright.ttf.woff2 b/packages/builder/assets/source-sans-3/SourceSans3VF-Upright.ttf.woff2 new file mode 100644 index 0000000000..96cc9fd06c Binary files /dev/null and b/packages/builder/assets/source-sans-3/SourceSans3VF-Upright.ttf.woff2 differ diff --git a/packages/builder/assets/source-sans-3/source-sans-3.css b/packages/builder/assets/source-sans-3/source-sans-3.css new file mode 100644 index 0000000000..e209f7a346 --- /dev/null +++ b/packages/builder/assets/source-sans-3/source-sans-3.css @@ -0,0 +1,15 @@ +@font-face{ + font-family: "Source Sans 3"; + font-weight: 200 900; + font-style: normal; + font-stretch: normal; + src: url("/builder/fonts/source-sans-3/SourceSans3VF-Upright.ttf.woff2") format("woff2-variations"); +} + +@font-face{ + font-family: "Source Sans 3"; + font-weight: 200 900; + font-style: italic; + font-stretch: normal; + src: url("/builder/fonts/source-sans-3/SourceSans3VF-Italic.ttf.woff2") format("woff2-variations"); +} \ No newline at end of file diff --git a/packages/builder/index.html b/packages/builder/index.html index eb151de75c..ad47dd4841 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -5,9 +5,7 @@ Budibase - - - + diff --git a/packages/builder/package.json b/packages/builder/package.json index 82e87c11ca..476ae7b977 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -61,7 +61,6 @@ "@codemirror/theme-one-dark": "^6.1.2", "@codemirror/view": "^6.11.2", "@dagrejs/dagre": "1.1.4", - "@fontsource/source-sans-pro": "^5.0.3", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", 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 48221a918d..19a965e961 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 @@ -180,7 +180,7 @@ } thead th { - font-family: "Source Sans Pro"; + font-family: "Source Sans 3"; color: var(--lightText); white-space: nowrap; padding: 12px; diff --git a/packages/builder/vite.config.mjs b/packages/builder/vite.config.mjs index e84716f631..ff3859a287 100644 --- a/packages/builder/vite.config.mjs +++ b/packages/builder/vite.config.mjs @@ -17,7 +17,7 @@ const copyFonts = dest => viteStaticCopy({ targets: [ { - src: "../../node_modules/@fontsource/source-sans-pro", + src: "./assets/source-sans-3", dest, }, { diff --git a/packages/frontend-core/src/components/ClientAppSkeleton.svelte b/packages/frontend-core/src/components/ClientAppSkeleton.svelte index 0590ce7862..6477df2a55 100644 --- a/packages/frontend-core/src/components/ClientAppSkeleton.svelte +++ b/packages/frontend-core/src/components/ClientAppSkeleton.svelte @@ -100,7 +100,7 @@ mix-blend-mode: multiply; background: rgb(0 0 0); font-size: 30px; - font-family: Source Sans Pro; + font-family: Source Sans 3; -webkit-font-smoothing: antialiased; } diff --git a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte index 6dfe98e18a..025daf22d6 100644 --- a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte +++ b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte @@ -39,9 +39,10 @@ {/if} - - - +