diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css index 7f8c6d5761..29b9186307 100644 --- a/docs/src/css/custom.css +++ b/docs/src/css/custom.css @@ -8,19 +8,19 @@ @tailwind utilities; @font-face { - font-family: 'Overpass'; - src: url('/fonts/overpass/Overpass.ttf') format('truetype-variations'); - font-weight: 1 999; + font-family: 'GoogleSans'; + src: url('/fonts/GoogleSans/GoogleSans.ttf') format('truetype-variations'); + font-weight: 410 900; font-style: normal; ascent-override: 106.25%; size-adjust: 106.25%; } @font-face { - font-family: 'Overpass Mono'; - src: url('/fonts/overpass/OverpassMono.ttf') format('truetype-variations'); - font-weight: 1 999; - font-style: normal; + font-family: 'GoogleSansCode'; + src: url('/fonts/GoogleSansCode/GoogleSansCode.ttf') format('truetype-variations'); + font-weight: 1 900; + font-style: monospace; ascent-override: 106.25%; size-adjust: 106.25%; } @@ -37,7 +37,8 @@ img { /* You can override the default Infima variables here. */ :root { - font-family: 'Overpass', sans-serif; + font-family: 'GoogleSans', sans-serif; + letter-spacing: 0.1px; --ifm-color-primary: #4250af; --ifm-color-primary-dark: #4250af; --ifm-color-primary-darker: #4250af; @@ -48,6 +49,16 @@ img { --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.1); } +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: 'GoogleSans', sans-serif; + letter-spacing: 0.1px; +} + /* For readability concerns, you should choose a lighter palette in dark mode. */ [data-theme='dark'] { --ifm-color-primary: #adcbfa; @@ -71,15 +82,22 @@ div[class^='announcementBar_'] { padding: 10px 10px 10px 16px; border-radius: 24px; margin-right: 16px; + font-weight: 500; } .menu__list-item-collapsible { margin-right: 16px; border-radius: 24px; + font-weight: 500; } .menu__link--active { - font-weight: 500; + font-weight: 600; +} + +.table-of-contents__link { + font-size: 14px; + font-weight: 450; } /* workaround for version switcher PR 15894 */ @@ -88,13 +106,14 @@ div[class*='navbar__items'] > li:has(a[class*='version-switcher-34ab39']) { } code { - font-weight: 600; + font-weight: 500; + font-family: 'GoogleSansCode'; } .buy-button { padding: 8px 14px; border: 1px solid transparent; - font-family: 'Overpass', sans-serif; + font-family: 'GoogleSans', sans-serif; font-weight: 500; cursor: pointer; box-shadow: 0 0 5px 2px rgba(181, 206, 254, 0.4); diff --git a/docs/static/fonts/GoogleSans/GoogleSans.ttf b/docs/static/fonts/GoogleSans/GoogleSans.ttf new file mode 100644 index 0000000000..5d9102f856 Binary files /dev/null and b/docs/static/fonts/GoogleSans/GoogleSans.ttf differ diff --git a/docs/static/fonts/GoogleSansCode/GoogleSansCode.ttf b/docs/static/fonts/GoogleSansCode/GoogleSansCode.ttf new file mode 100644 index 0000000000..b68d037edf Binary files /dev/null and b/docs/static/fonts/GoogleSansCode/GoogleSansCode.ttf differ diff --git a/docs/static/fonts/overpass/Overpass-Italic.ttf b/docs/static/fonts/overpass/Overpass-Italic.ttf deleted file mode 100644 index 281dd742bb..0000000000 Binary files a/docs/static/fonts/overpass/Overpass-Italic.ttf and /dev/null differ diff --git a/docs/static/fonts/overpass/Overpass.ttf b/docs/static/fonts/overpass/Overpass.ttf deleted file mode 100644 index 1cf730a5ad..0000000000 Binary files a/docs/static/fonts/overpass/Overpass.ttf and /dev/null differ diff --git a/docs/static/fonts/overpass/OverpassMono.ttf b/docs/static/fonts/overpass/OverpassMono.ttf deleted file mode 100644 index 71ef818b33..0000000000 Binary files a/docs/static/fonts/overpass/OverpassMono.ttf and /dev/null differ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a58f9f43e..c4de9717b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -738,8 +738,8 @@ importers: specifier: file:../open-api/typescript-sdk version: link:../open-api/typescript-sdk '@immich/ui': - specifier: ^0.56.1 - version: 0.56.1(@sveltejs/kit@2.49.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.3(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1) + specifier: ^0.57.3 + version: 0.57.3(@sveltejs/kit@2.49.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.3(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1) '@mapbox/mapbox-gl-rtl-text': specifier: 0.2.3 version: 0.2.3(mapbox-gl@1.13.3) @@ -3087,8 +3087,8 @@ packages: peerDependencies: svelte: ^5.0.0 - '@immich/ui@0.56.1': - resolution: {integrity: sha512-W4uEQn9pxVKRvIV7sl9p6dU2r7xlVsMFxBeClxtXzSsiJEoE10uZwBIm0L9q17c4TQ/+lk9e/w1e4jNSvFqFwQ==} + '@immich/ui@0.57.3': + resolution: {integrity: sha512-5Y0KmyHRojem1gvX4hbr01GZ35oq22AkYE3CImvg3+jmZQhP0newTiqyVYJsfnEupLZKu5bFIlWykIe8uwMqDQ==} peerDependencies: svelte: ^5.0.0 @@ -15144,7 +15144,7 @@ snapshots: dependencies: svelte: 5.46.1 - '@immich/ui@0.56.1(@sveltejs/kit@2.49.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.3(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1)': + '@immich/ui@0.57.3(@sveltejs/kit@2.49.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.3(svelte@5.46.1)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.1)': dependencies: '@immich/svelte-markdown-preprocess': 0.1.0(svelte@5.46.1) '@internationalized/date': 3.10.0 diff --git a/web/package.json b/web/package.json index 99a7663f62..e02bbefacc 100644 --- a/web/package.json +++ b/web/package.json @@ -27,7 +27,7 @@ "@formatjs/icu-messageformat-parser": "^3.0.0", "@immich/justified-layout-wasm": "^0.4.3", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.56.1", + "@immich/ui": "^0.57.3", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.14.0", diff --git a/web/src/app.css b/web/src/app.css index bf7601f63b..ca4634cfd9 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -49,7 +49,7 @@ } @theme { - --font-immich-mono: Overpass Mono, monospace; + --font-immich-mono: GoogleSansCode, monospace; --spacing-18: 4.5rem; @@ -84,25 +84,25 @@ @layer utilities { @font-face { - font-family: 'Overpass'; - src: url('$lib/assets/fonts/overpass/Overpass.ttf') format('truetype-variations'); - font-weight: 1 999; + font-family: 'GoogleSans'; + src: url('$lib/assets/fonts/GoogleSans/GoogleSans.ttf') format('truetype-variations'); + font-weight: 410 900; font-style: normal; ascent-override: 106.25%; size-adjust: 106.25%; } @font-face { - font-family: 'Overpass Mono'; - src: url('$lib/assets/fonts/overpass/OverpassMono.ttf') format('truetype-variations'); - font-weight: 1 999; + font-family: 'GoogleSansCode'; + src: url('$lib/assets/fonts/GoogleSansCode/GoogleSansCode.ttf') format('truetype-variations'); + font-weight: 1 900; font-style: monospace; - ascent-override: 106.25%; - size-adjust: 106.25%; } :root { - font-family: 'Overpass', sans-serif; + font-family: 'GoogleSans', sans-serif; + letter-spacing: 0.1px; + /* Used by layouts to ensure proper spacing between navbar and content */ --navbar-height: calc(4.5rem + 4px); --navbar-height-md: calc(4.5rem + 4px - 14px); diff --git a/web/src/hooks.server.ts b/web/src/hooks.server.ts index 1606f92796..4a08e7bf61 100644 --- a/web/src/hooks.server.ts +++ b/web/src/hooks.server.ts @@ -1,12 +1,12 @@ -import overpass from '$lib/assets/fonts/overpass/Overpass.ttf?url'; -import overpassMono from '$lib/assets/fonts/overpass/OverpassMono.ttf?url'; +import GoogleSans from '$lib/assets/fonts/GoogleSans/GoogleSans.ttf?url'; +import GoogleSansCode from '$lib/assets/fonts/GoogleSansCode/GoogleSansCode.ttf?url'; import type { Handle } from '@sveltejs/kit'; // only used during the build to replace the variables from app.html export const handle = (async ({ event, resolve }) => { return resolve(event, { transformPageChunk: ({ html }) => { - return html.replace('%app.font%', overpass).replace('%app.monofont%', overpassMono); + return html.replace('%app.font%', GoogleSans).replace('%app.monofont%', GoogleSansCode); }, }); }) satisfies Handle; diff --git a/web/src/lib/assets/fonts/GoogleSans/GoogleSans.ttf b/web/src/lib/assets/fonts/GoogleSans/GoogleSans.ttf new file mode 100644 index 0000000000..5d9102f856 Binary files /dev/null and b/web/src/lib/assets/fonts/GoogleSans/GoogleSans.ttf differ diff --git a/web/src/lib/assets/fonts/GoogleSansCode/GoogleSansCode.ttf b/web/src/lib/assets/fonts/GoogleSansCode/GoogleSansCode.ttf new file mode 100644 index 0000000000..b68d037edf Binary files /dev/null and b/web/src/lib/assets/fonts/GoogleSansCode/GoogleSansCode.ttf differ diff --git a/web/src/lib/assets/fonts/overpass/Overpass-Italic.ttf b/web/src/lib/assets/fonts/overpass/Overpass-Italic.ttf deleted file mode 100644 index 281dd742bb..0000000000 Binary files a/web/src/lib/assets/fonts/overpass/Overpass-Italic.ttf and /dev/null differ diff --git a/web/src/lib/assets/fonts/overpass/Overpass.ttf b/web/src/lib/assets/fonts/overpass/Overpass.ttf deleted file mode 100644 index 1cf730a5ad..0000000000 Binary files a/web/src/lib/assets/fonts/overpass/Overpass.ttf and /dev/null differ diff --git a/web/src/lib/assets/fonts/overpass/OverpassMono.ttf b/web/src/lib/assets/fonts/overpass/OverpassMono.ttf deleted file mode 100644 index 71ef818b33..0000000000 Binary files a/web/src/lib/assets/fonts/overpass/OverpassMono.ttf and /dev/null differ diff --git a/web/src/lib/components/album-page/album-description.svelte b/web/src/lib/components/album-page/album-description.svelte index 2b2a185c5b..00744832a7 100644 --- a/web/src/lib/components/album-page/album-description.svelte +++ b/web/src/lib/components/album-page/album-description.svelte @@ -31,7 +31,7 @@ {#if isOwned}