Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat(studio): fonts (#47306)

Francesco Sansalvadore33dc3c1f1cf7
diff --git a/apps/studio/fonts/CustomFont-Black.woff2 b/apps/studio/fonts/CustomFont-Black.woff2
deleted file mode 100644
index e3c834e57f2..00000000000
Binary files a/apps/studio/fonts/CustomFont-Black.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/CustomFont-BlackItalic.woff2 b/apps/studio/fonts/CustomFont-BlackItalic.woff2
deleted file mode 100644
index f84036283ec..00000000000
Binary files a/apps/studio/fonts/CustomFont-BlackItalic.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/CustomFont-Bold.woff2 b/apps/studio/fonts/CustomFont-Bold.woff2
deleted file mode 100644
index 5e7af459481..00000000000
Binary files a/apps/studio/fonts/CustomFont-Bold.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/CustomFont-BoldItalic.woff2 b/apps/studio/fonts/CustomFont-BoldItalic.woff2
deleted file mode 100644
index ac0edd55fd3..00000000000
Binary files a/apps/studio/fonts/CustomFont-BoldItalic.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/CustomFont-Book.woff2 b/apps/studio/fonts/CustomFont-Book.woff2
deleted file mode 100644
index abd31f7ec27..00000000000
Binary files a/apps/studio/fonts/CustomFont-Book.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/CustomFont-BookItalic.woff2 b/apps/studio/fonts/CustomFont-BookItalic.woff2
deleted file mode 100644
index d326c8672cc..00000000000
Binary files a/apps/studio/fonts/CustomFont-BookItalic.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/CustomFont-Medium.woff2 b/apps/studio/fonts/CustomFont-Medium.woff2
deleted file mode 100644
index c07131ddec9..00000000000
Binary files a/apps/studio/fonts/CustomFont-Medium.woff2 and /dev/null differ
diff --git a/apps/studio/fonts/index.ts b/apps/studio/fonts/index.ts
index 272cd5acd2d..431e1d45203 100644
--- a/apps/studio/fonts/index.ts
+++ b/apps/studio/fonts/index.ts
@@ -1,53 +1,44 @@
-import { Source_Code_Pro } from 'next/font/google'
+import { Manrope } from 'next/font/google'
import localFont from 'next/font/local'
-export const customFont = localFont({
- variable: '--font-custom',
+export const manrope = Manrope({
+ variable: '--font-manrope',
display: 'swap',
- fallback: ['Circular', 'custom-font', 'Helvetica Neue', 'Helvetica', 'Arial', 'sans-serif'],
+ subsets: ['latin'],
+})
+
+export const inter = localFont({
+ variable: '--font-inter',
+ display: 'swap',
+ fallback: ['system-ui', 'Helvetica Neue', 'Helvetica', 'Arial', 'sans-serif'],
src: [
{
- path: './CustomFont-Book.woff2',
- weight: '400',
- style: 'normal',
- },
- {
- path: './CustomFont-BookItalic.woff2',
- weight: '400',
- style: 'italic',
- },
- {
- path: './CustomFont-Medium.woff2',
- weight: '500',
- style: 'normal',
- },
- {
- path: './CustomFont-Bold.woff2',
- weight: '700',
+ path: './inter/InterVariable.woff2',
+ weight: '100 900',
style: 'normal',
},
{
- path: './CustomFont-BoldItalic.woff2',
- weight: '700',
+ path: './inter/InterVariable-Italic.woff2',
+ weight: '100 900',
style: 'italic',
},
+ ],
+})
+
+export const sourceCodePro = localFont({
+ variable: '--font-source-code-pro',
+ display: 'swap',
+ fallback: ['Source Code Pro', 'Office Code Pro', 'Menlo', 'monospace'],
+ src: [
{
- path: './CustomFont-Black.woff2',
- weight: '800',
+ path: './source-code-pro/SourceCodePro-Variable.woff2',
+ weight: '200 900',
style: 'normal',
},
{
- path: './CustomFont-BlackItalic.woff2',
- weight: '800',
+ path: './source-code-pro/SourceCodePro-Variable-Italic.woff2',
+ weight: '200 900',
style: 'italic',
},
],
})
-
-export const sourceCodePro = Source_Code_Pro({
- subsets: ['latin'],
- fallback: ['Source Code Pro', 'Office Code Pro', 'Menlo', 'monospace'],
- variable: '--font-source-code-pro',
- display: 'swap',
- weight: ['400', '500', '600', '700'],
-})
diff --git a/apps/studio/fonts/inter/InterVariable-Italic.woff2 b/apps/studio/fonts/inter/InterVariable-Italic.woff2
new file mode 100644
index 00000000000..2f06c65192b
Binary files /dev/null and b/apps/studio/fonts/inter/InterVariable-Italic.woff2 differ
diff --git a/apps/studio/fonts/inter/InterVariable.woff2 b/apps/studio/fonts/inter/InterVariable.woff2
new file mode 100644
index 00000000000..d15208de03c
Binary files /dev/null and b/apps/studio/fonts/inter/InterVariable.woff2 differ
diff --git a/apps/studio/fonts/source-code-pro/SourceCodePro-Variable-Italic.woff2 b/apps/studio/fonts/source-code-pro/SourceCodePro-Variable-Italic.woff2
new file mode 100644
index 00000000000..893f998497c
Binary files /dev/null and b/apps/studio/fonts/source-code-pro/SourceCodePro-Variable-Italic.woff2 differ
diff --git a/apps/studio/fonts/source-code-pro/SourceCodePro-Variable.woff2 b/apps/studio/fonts/source-code-pro/SourceCodePro-Variable.woff2
new file mode 100644
index 00000000000..bc303f50c5d
Binary files /dev/null and b/apps/studio/fonts/source-code-pro/SourceCodePro-Variable.woff2 differ
diff --git a/apps/studio/pages/_app.tsx b/apps/studio/pages/_app.tsx
index 1c1342f96b8..2a4421b4a1d 100644
--- a/apps/studio/pages/_app.tsx
+++ b/apps/studio/pages/_app.tsx
@@ -52,7 +52,7 @@ import { GlobalErrorBoundaryState } from '@/components/ui/ErrorBoundary/GlobalEr
import { GlobalShortcuts } from '@/components/ui/GlobalShortcuts/GlobalShortcuts'
import { getCLIReleaseVersion } from '@/data/misc/cli-release-version-query'
import { useRootQueryClient } from '@/data/query-client'
-import { customFont, sourceCodePro } from '@/fonts'
+import { inter, manrope, sourceCodePro } from '@/fonts'
import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { AuthProvider } from '@/lib/auth'
@@ -186,7 +186,7 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) {
{/* [Alaister]: This has to be an inline style tag here and not a separate component due to next/font */}
<style
dangerouslySetInnerHTML={{
- __html: `:root{--font-custom:${customFont.style.fontFamily};--font-source-code-pro:${sourceCodePro.style.fontFamily};}`,
+ __html: `:root{--font-sans:${inter.style.fontFamily};--font-heading:${manrope.style.fontFamily};--font-source-code-pro:${sourceCodePro.style.fontFamily};}`,
}}
/>
{/* Speed up initial API loading times by pre-connecting to the API domain */}
diff --git a/apps/studio/pages/_document.tsx b/apps/studio/pages/_document.tsx
index b743dc5daef..8560136df0f 100644
--- a/apps/studio/pages/_document.tsx
+++ b/apps/studio/pages/_document.tsx
@@ -1,5 +1,7 @@
import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document'
+import { inter, manrope, sourceCodePro } from '@/fonts'
+
class MyDocument extends Document {
static async getInitialProps(ctx: DocumentContext) {
const initialProps = await Document.getInitialProps(ctx)
@@ -11,7 +13,7 @@ class MyDocument extends Document {
return (
<Html lang="en">
<Head />
- <body>
+ <body className={`${inter.variable} ${manrope.variable} ${sourceCodePro.variable}`}>
<Main />
<NextScript />
</body>
diff --git a/apps/studio/styles/fonts.css b/apps/studio/styles/fonts.css
index 46905213121..e364ee2c426 100644
--- a/apps/studio/styles/fonts.css
+++ b/apps/studio/styles/fonts.css
@@ -7,62 +7,22 @@
*/
@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-Book.woff2') format('woff2');
- font-weight: 400;
+ font-family: 'Inter';
+ src: url('../fonts/inter/InterVariable.woff2') format('woff2');
+ font-weight: 100 900;
font-style: normal;
font-display: swap;
}
@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-BookItalic.woff2') format('woff2');
- font-weight: 400;
- font-style: italic;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-Medium.woff2') format('woff2');
- font-weight: 500;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-Bold.woff2') format('woff2');
- font-weight: 700;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-BoldItalic.woff2') format('woff2');
- font-weight: 700;
- font-style: italic;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-Black.woff2') format('woff2');
- font-weight: 800;
- font-style: normal;
- font-display: swap;
-}
-
-@font-face {
- font-family: 'CustomFont';
- src: url('../fonts/CustomFont-BlackItalic.woff2') format('woff2');
- font-weight: 800;
+ font-family: 'Inter';
+ src: url('../fonts/inter/InterVariable-Italic.woff2') format('woff2');
+ font-weight: 100 900;
font-style: italic;
font-display: swap;
}
:root {
- --font-custom: 'CustomFont', Circular, 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ --font-custom: 'Inter', system-ui, 'Helvetica Neue', Helvetica, Arial, sans-serif;
--font-source-code-pro: 'Source Code Pro', 'Office Code Pro', Menlo, monospace;
}
diff --git a/apps/studio/styles/globals.css b/apps/studio/styles/globals.css
index f312b19cfa8..1a6b3947c63 100644
--- a/apps/studio/styles/globals.css
+++ b/apps/studio/styles/globals.css
@@ -7,6 +7,10 @@
@source './../../../packages/ui/src/**/*.{tsx,ts,js}';
@source './../../../packages/ui-patterns/src/**/*.{tsx,ts,js}';
+@theme inline {
+ --font-heading: var(--font-heading, var(--font-sans));
+}
+
@theme {
--text-grid: 13px;
@@ -47,6 +51,21 @@
--animate-chevron-up: chevron-up 2s ease-in-out infinite;
--animate-sway: sway 3s cubic-bezier(0.4, 0, 0.6, 1) infinite;
--animate-marketplace-featured-progress: marketplace-featured-progress linear forwards;
+
+ /* font sizing and weights optimized for Inter */
+ --text-sm: 0.8125rem;
+ --text-base: 0.9375rem;
+ --text-lg: 1rem;
+ --text-xl: 1.125rem;
+ --text-2xl: 1.375rem;
+ --text-3xl: 1.75rem;
+ --text-4xl: 2.125rem;
+ --text-5xl: 2.875rem;
+ --text-6xl: 3.625rem;
+ --text-7xl: 4.375rem;
+ --text-8xl: 5.875rem;
+ --text-9xl: 7.875rem;
+ --font-weight-normal: 450;
}
@keyframes shimmer {
@@ -178,12 +197,22 @@ body,
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
overscroll-behavior: none;
+ font-weight: 450;
}
* {
box-sizing: border-box;
}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ @apply font-heading font-semibold;
+}
+
.form-group .form-text,
.Form .form-text {
@apply text-foreground-lighter;
diff --git a/packages/config/css/theme.css b/packages/config/css/theme.css
index e69cddd24b3..f0084ebf05c 100644
--- a/packages/config/css/theme.css
+++ b/packages/config/css/theme.css
@@ -324,7 +324,7 @@
/* misc theme tokens — typography, breakpoints, sizing, transform-origin */
--font-sans: var(
- --font-custom,
+ --font-sans,
Circular,
custom-font,
Helvetica Neue,