diff --git a/src/app.html b/src/app.html index 4efaaef1f..18a92b1fa 100644 --- a/src/app.html +++ b/src/app.html @@ -7,128 +7,6 @@ content="Appwrite is an open-source platform for building applications at any scale, using your preferred programming languages and tools." /> - - - - - - - - - - - - - - - - - - - - - - %sveltekit.head% diff --git a/src/lib/components/billing/estimatedTotalBox.svelte b/src/lib/components/billing/estimatedTotalBox.svelte index 5fa7bee1d..e8adcb489 100644 --- a/src/lib/components/billing/estimatedTotalBox.svelte +++ b/src/lib/components/billing/estimatedTotalBox.svelte @@ -82,6 +82,8 @@ {#if budgetEnabled}
- + Grant access to any member of a specific team. To grant access to team members with specific roles, you will need to set a dispatch('custom')} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 9bc2eb60b..6a2591f2c 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -21,9 +21,9 @@ function resolveTheme(theme: AppStore['themeInUse']) { switch (theme) { case 'dark': - return true ? ThemeDarkCloud : ThemeDark; //TODO: remove after cloud instance is live + return isCloud ? ThemeDarkCloud : ThemeDark; case 'light': - return true ? ThemeLightCloud : ThemeLight; + return isCloud ? ThemeLightCloud : ThemeLight; } } @@ -67,6 +67,7 @@ } } } + if (user && $page.url.searchParams.has('campaign')) { const campaignId = $page.url.searchParams.get('campaign'); const campaign = await sdk.forConsole.billing @@ -123,15 +124,41 @@ }); } } + + const preloadFonts = [ + base + '/fonts/inter/inter-v8-latin-600.woff2', + base + '/fonts/inter/inter-v8-latin-regular.woff2', + base + '/fonts/poppins/poppins-v19-latin-500.woff2', + base + '/fonts/poppins/poppins-v19-latin-600.woff2', + base + '/fonts/poppins/poppins-v19-latin-700.woff2', + base + '/fonts/source-code-pro/source-code-pro-v20-latin-regular.woff2' + ]; + const preloadFontsCloud = [ + 'https://fonts.appwrite.io/aeonik-pro/AeonikPro-Regular.woff2', + 'https://fonts.appwrite.io/aeonik-pro/AeonikPro-Medium.woff2', + 'https://fonts.appwrite.io/aeonik-pro/AeonikPro-Bold.woff2', + 'https://fonts.appwrite.io/aeonik-fono/AeonikFono-Regular.woff2', + 'https://fonts.appwrite.io/aeonik-fono/AeonikFono-Medium.woff2', + 'https://fonts.appwrite.io/aeonik-fono/AeonikFono-Bold.woff2' + ]; - - - + {#each preloadFonts as font} + + {/each} + + + {#if isCloud} + {#each preloadFontsCloud as font} + + {/each} + + + {/if} diff --git a/src/themes/light.json b/src/themes/light.json index a2ab55069..2b3bd76ae 100644 --- a/src/themes/light.json +++ b/src/themes/light.json @@ -118,9 +118,9 @@ "overlay-skeleton": "rgba(25, 25, 28, 4%)", "gradient-border-button-secondary-bottom": "var(--border-neutral)", "gradient-border-button-secondary-top": "var(--border-neutral-strong)", - "font-family-brand": "Aeonik Pro", + "font-family-brand": "Inter", "font-family-sansserif": "Inter", - "font-family-monospace": "Aeonik Fono", + "font-family-monospace": "Fira Code", "font-family-code": "Fira Code", "font-weight-regular": "Regular", "font-weight-medium": "Medium", diff --git a/static/fonts/cloud.css b/static/fonts/cloud.css index c7650c179..26277ee0e 100644 --- a/static/fonts/cloud.css +++ b/static/fonts/cloud.css @@ -1,51 +1,3 @@ -@font-face { - font-family: 'Aeonik Pro'; - font-style: normal; - font-weight: 100; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-Air.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: italic; - font-weight: 100; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-AirItalic.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: normal; - font-weight: 200; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-Thin.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: italic; - font-weight: 200; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-ThinItalic.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-Light.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-LightItalic.woff2') format('woff2'); -} - @font-face { font-family: 'Aeonik Pro'; font-style: normal; @@ -54,14 +6,6 @@ src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-Regular.woff2') format('woff2'); } -@font-face { - font-family: 'Aeonik Pro'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-RegularItalic.woff2') format('woff2'); -} - @font-face { font-family: 'Aeonik Pro'; font-style: normal; @@ -70,14 +14,6 @@ src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-Medium.woff2') format('woff2'); } -@font-face { - font-family: 'Aeonik Pro'; - font-style: italic; - font-weight: 500; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-MediumItalic.woff2') format('woff2'); -} - @font-face { font-family: 'Aeonik Pro'; font-style: normal; @@ -87,25 +23,25 @@ } @font-face { - font-family: 'Aeonik Pro'; - font-style: italic; + font-family: 'Aenoik Fono'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('https://fonts.appwrite.io/aeonik-fono/AeonikFono-Regular.woff2') format('woff2'); +} + +@font-face { + font-family: 'Aenoik Fono'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('https://fonts.appwrite.io/aeonik-fono/AeonikFono-Medium.woff2') format('woff2'); +} + +@font-face { + font-family: 'Aenoik Fono'; + font-style: normal; font-weight: 600; font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-BoldItalic.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-Black.woff2') format('woff2'); -} - -@font-face { - font-family: 'Aeonik Pro'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url('https://fonts.appwrite.io/aeonik-pro/AeonikPro-BlackItalic.woff2') format('woff2'); + src: url('https://fonts.appwrite.io/aeonik-fono/AeonikFono-Bold.woff2') format('woff2'); }