Skip to content

Commit f1c819e

Browse files
TorstenDittmannTorstenDittmann
authored
Merge pull request #2652 from appwrite/feat-profiles-updates
2 parents cbe83db + 8ce319f commit f1c819e

File tree

7 files changed

+114
-12
lines changed

7 files changed

+114
-12
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@appwrite.io/pink-icons": "0.25.0",
2727
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@5b26bb8",
2828
"@appwrite.io/pink-legacy": "^1.0.3",
29-
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@5b26bb8",
29+
"@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@33845eb",
3030
"@faker-js/faker": "^9.9.0",
3131
"@popperjs/core": "^2.11.8",
3232
"@sentry/sveltekit": "^10.25.0",

‎pnpm-lock.yaml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/profiles/index.svelte.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export type Profile = {
3333
showExtendedAccountsMenu: boolean;
3434
showGeneralAvailability: boolean;
3535
showConnectProjectOnToolbar: boolean;
36+
showProgressBar: boolean;
3637
services: {
3738
'get-started': boolean;
3839
overview: boolean;
@@ -74,6 +75,7 @@ export const base: Profile = {
7475
showExtendedAccountsMenu: false,
7576
showGeneralAvailability: true,
7677
showConnectProjectOnToolbar: true,
78+
showProgressBar: true,
7779
services: {
7880
'get-started': true,
7981
overview: true,
@@ -117,6 +119,7 @@ export const studio: Profile = {
117119
showExtendedAccountsMenu: true,
118120
showGeneralAvailability: false,
119121
showConnectProjectOnToolbar: false,
122+
showProgressBar: false,
120123
services: {
121124
'get-started': false,
122125
overview: false,

‎src/routes/+layout.svelte‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { browser } from '$app/environment';
33
import { afterNavigate, goto } from '$app/navigation';
4-
import { base } from '$app/paths';
4+
import { asset, base } from '$app/paths';
55
import { page } from '$app/state';
66
import { trackPageView } from '$lib/actions/analytics';
77
import { Notifications, Progress } from '$lib/layout';
@@ -181,15 +181,19 @@
181181
{#each preloadFontsCloud as font}
182182
<link rel="preload" href={font} as="font" type="font/woff2" crossorigin="anonymous" />
183183
{/each}
184-
<link rel="preload" as="style" type="text/css" href="{base}/fonts/cloud.css" />
185-
<link rel="stylesheet" href={`${base}/fonts/cloud.css`} />
184+
{#if resolvedProfile.id === ProfileMode.CONSOLE}
185+
<link rel="preload" as="style" type="text/css" href="{base}/fonts/cloud.css" />
186+
<link rel="stylesheet" href={`${base}/fonts/cloud.css`} />
187+
{/if}
186188
{/if}
187189

188190
<link rel="stylesheet" href={resolvedProfile.css} />
189191

190192
{#if resolvedProfile.id === ProfileMode.STUDIO}
191193
<link rel="preload" as="style" type="text/css" href={CDN_CSS_URL} />
192194
<link rel="preload" as="script" type="text/javascript" href={CDN_URL} />
195+
<link rel="preload" as="style" type="text/css" href={asset('/fonts/studio.css')} />
196+
<link rel="stylesheet" href={asset('/fonts/studio.css')} />
193197
{/if}
194198
</svelte:head>
195199

@@ -201,7 +205,9 @@
201205

202206
<slot />
203207

204-
<Progress />
208+
{#if resolvedProfile.showProgressBar}
209+
<Progress />
210+
{/if}
205211
</Root>
206212

207213
<style lang="scss" global>

‎src/themes/dark-studio.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
"bgcolor-accent": "var(--neutral-50)",
33
"bgcolor-accent-secondary": "var(--neutral-100)",
44
"bgcolor-accent-tertiary": "var(--neutral-150)",
5-
"fgcolor-on-accent": "var(--neutral-950)"
5+
"fgcolor-on-accent": "var(--neutral-950)",
6+
"font-family-brand": "neue-haas-grotesk-display",
7+
"font-family-sansserif": "neue-haas-grotesk-text"
68
}

‎src/themes/light-studio.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"bgcolor-accent": "var(--neutral-1000)",
33
"bgcolor-accent-secondary": "var(--neutral-900)",
4-
"bgcolor-accent-tertiary": "var(--neutral-850)"
4+
"bgcolor-accent-tertiary": "var(--neutral-850)",
5+
"font-family-brand": "neue-haas-grotesk-display",
6+
"font-family-sansserif": "neue-haas-grotesk-text"
57
}

‎static/fonts/studio.css‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
@font-face {
2+
font-family: 'neue-haas-grotesk-display';
3+
src:
4+
url('https://use.typekit.net/af/174ae3/00000000000000007735bb5a/31/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n5&v=3')
5+
format('woff2'),
6+
url('https://use.typekit.net/af/174ae3/00000000000000007735bb5a/31/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n5&v=3')
7+
format('woff'),
8+
url('https://use.typekit.net/af/174ae3/00000000000000007735bb5a/31/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n5&v=3')
9+
format('opentype');
10+
font-display: auto;
11+
font-style: normal;
12+
font-weight: 500;
13+
font-stretch: normal;
14+
}
15+
16+
@font-face {
17+
font-family: 'neue-haas-grotesk-display';
18+
src:
19+
url('https://use.typekit.net/af/c7a282/00000000000000007735bb62/31/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n6&v=3')
20+
format('woff2'),
21+
url('https://use.typekit.net/af/c7a282/00000000000000007735bb62/31/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n6&v=3')
22+
format('woff'),
23+
url('https://use.typekit.net/af/c7a282/00000000000000007735bb62/31/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n6&v=3')
24+
format('opentype');
25+
font-display: auto;
26+
font-style: normal;
27+
font-weight: 600;
28+
font-stretch: normal;
29+
}
30+
31+
@font-face {
32+
font-family: 'neue-haas-grotesk-text';
33+
src:
34+
url('https://use.typekit.net/af/912d1e/00000000000000007735bb33/31/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3')
35+
format('woff2'),
36+
url('https://use.typekit.net/af/912d1e/00000000000000007735bb33/31/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3')
37+
format('woff'),
38+
url('https://use.typekit.net/af/912d1e/00000000000000007735bb33/31/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3')
39+
format('opentype');
40+
font-display: auto;
41+
font-style: normal;
42+
font-weight: 400;
43+
font-stretch: normal;
44+
}
45+
46+
@font-face {
47+
font-family: 'neue-haas-grotesk-text';
48+
src:
49+
url('https://use.typekit.net/af/68dda9/00000000000000007735bb35/31/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i4&v=3')
50+
format('woff2'),
51+
url('https://use.typekit.net/af/68dda9/00000000000000007735bb35/31/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i4&v=3')
52+
format('woff'),
53+
url('https://use.typekit.net/af/68dda9/00000000000000007735bb35/31/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i4&v=3')
54+
format('opentype');
55+
font-display: auto;
56+
font-style: italic;
57+
font-weight: 400;
58+
font-stretch: normal;
59+
}
60+
61+
@font-face {
62+
font-family: 'neue-haas-grotesk-text';
63+
src:
64+
url('https://use.typekit.net/af/c002e2/00000000000000007735bb32/31/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n5&v=3')
65+
format('woff2'),
66+
url('https://use.typekit.net/af/c002e2/00000000000000007735bb32/31/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n5&v=3')
67+
format('woff'),
68+
url('https://use.typekit.net/af/c002e2/00000000000000007735bb32/31/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n5&v=3')
69+
format('opentype');
70+
font-display: auto;
71+
font-style: normal;
72+
font-weight: 500;
73+
font-stretch: normal;
74+
}
75+
76+
@font-face {
77+
font-family: 'neue-haas-grotesk-text';
78+
src:
79+
url('https://use.typekit.net/af/2288cb/00000000000000007735bb39/31/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3')
80+
format('woff2'),
81+
url('https://use.typekit.net/af/2288cb/00000000000000007735bb39/31/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3')
82+
format('woff'),
83+
url('https://use.typekit.net/af/2288cb/00000000000000007735bb39/31/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3')
84+
format('opentype');
85+
font-display: auto;
86+
font-style: normal;
87+
font-weight: 700;
88+
font-stretch: normal;
89+
}

0 commit comments

Comments
 (0)