diff --git a/web/satellite/package-lock.json b/web/satellite/package-lock.json index c4ac08c61..796ffadf1 100644 --- a/web/satellite/package-lock.json +++ b/web/satellite/package-lock.json @@ -11,6 +11,7 @@ "@aws-sdk/client-s3": "3.379.1", "@aws-sdk/lib-storage": "3.379.1", "@aws-sdk/s3-request-presigner": "3.379.1", + "@fontsource-variable/inter": "^5.0.8", "@hcaptcha/vue3-hcaptcha": "1.2.1", "@mdi/font": "7.0.96", "@smithy/signature-v4": "2.0.1", @@ -1597,6 +1598,11 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@fontsource-variable/inter": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource-variable/inter/-/inter-5.0.8.tgz", + "integrity": "sha512-WkYfFNccmEIeL2fNg0mYeLWqOoB7xD8MFxFRc4IwbSP2o8ZaBt36v5aW4by4MyrgGRMNk7uNi5LbvYKq6clPjw==" + }, "node_modules/@hcaptcha/vue3-hcaptcha": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@hcaptcha/vue3-hcaptcha/-/vue3-hcaptcha-1.2.1.tgz", diff --git a/web/satellite/package.json b/web/satellite/package.json index 32add3680..fdf8bb24e 100644 --- a/web/satellite/package.json +++ b/web/satellite/package.json @@ -19,9 +19,10 @@ "@aws-sdk/client-s3": "3.379.1", "@aws-sdk/lib-storage": "3.379.1", "@aws-sdk/s3-request-presigner": "3.379.1", - "@smithy/signature-v4": "2.0.1", + "@fontsource-variable/inter": "^5.0.8", "@hcaptcha/vue3-hcaptcha": "1.2.1", "@mdi/font": "7.0.96", + "@smithy/signature-v4": "2.0.1", "bip39-english": "2.5.0", "chart.js": "4.2.1", "pinia": "2.0.23", diff --git a/web/satellite/src/App.vue b/web/satellite/src/App.vue index 8e41b9bb3..afaac2794 100644 --- a/web/satellite/src/App.vue +++ b/web/satellite/src/App.vue @@ -121,9 +121,7 @@ onBeforeUnmount((): void => { font-display: swap; src: local(''), - url('../static/fonts/inter-v3-latin-regular.woff2') format('woff2'), - url('../static/fonts/inter-v3-latin-regular.woff') format('woff'), - url('../static/fonts/inter-v3-latin-regular.ttf') format('truetype'); + url('@fontsource-variable/inter/files/inter-latin-standard-normal.woff2') format('woff2'); } @font-face { @@ -133,9 +131,7 @@ onBeforeUnmount((): void => { font-display: swap; src: local(''), - url('../static/fonts/inter-v3-latin-600.woff2') format('woff2'), - url('../static/fonts/inter-v3-latin-600.woff') format('woff'), - url('../static/fonts/inter-v3-latin-600.ttf') format('truetype'); + url('@fontsource-variable/inter/files/inter-latin-standard-normal.woff2') format('woff2'); } @font-face { @@ -145,9 +141,7 @@ onBeforeUnmount((): void => { font-display: swap; src: local(''), - url('../static/fonts/inter-v3-latin-800.woff2') format('woff2'), - url('../static/fonts/inter-v3-latin-800.woff') format('woff'), - url('../static/fonts/inter-v3-latin-800.ttf') format('truetype'); + url('@fontsource-variable/inter/files/inter-latin-standard-normal.woff2') format('woff2'); } a { diff --git a/web/satellite/static/fonts/inter-v3-latin-600.ttf b/web/satellite/static/fonts/inter-v3-latin-600.ttf deleted file mode 100644 index 994e59414..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-600.ttf and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-600.woff b/web/satellite/static/fonts/inter-v3-latin-600.woff deleted file mode 100644 index 44a4a3ccb..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-600.woff and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-600.woff2 b/web/satellite/static/fonts/inter-v3-latin-600.woff2 deleted file mode 100644 index 924ae728d..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-600.woff2 and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-800.ttf b/web/satellite/static/fonts/inter-v3-latin-800.ttf deleted file mode 100644 index 564f55ef0..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-800.ttf and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-800.woff b/web/satellite/static/fonts/inter-v3-latin-800.woff deleted file mode 100644 index d29270265..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-800.woff and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-800.woff2 b/web/satellite/static/fonts/inter-v3-latin-800.woff2 deleted file mode 100644 index d84297b4a..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-800.woff2 and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-regular.ttf b/web/satellite/static/fonts/inter-v3-latin-regular.ttf deleted file mode 100644 index b9d13017b..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-regular.ttf and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-regular.woff b/web/satellite/static/fonts/inter-v3-latin-regular.woff deleted file mode 100644 index 4960fbe05..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-regular.woff and /dev/null differ diff --git a/web/satellite/static/fonts/inter-v3-latin-regular.woff2 b/web/satellite/static/fonts/inter-v3-latin-regular.woff2 deleted file mode 100644 index b5db4467b..000000000 Binary files a/web/satellite/static/fonts/inter-v3-latin-regular.woff2 and /dev/null differ diff --git a/web/satellite/vuetify-poc/src/plugins/index.ts b/web/satellite/vuetify-poc/src/plugins/index.ts index 9f59e3b8b..a36619732 100644 --- a/web/satellite/vuetify-poc/src/plugins/index.ts +++ b/web/satellite/vuetify-poc/src/plugins/index.ts @@ -13,7 +13,6 @@ import { createPinia, setActivePinia } from 'pinia'; import router from '../router'; -import { loadFonts } from './webfontloader'; import vuetify from './vuetify'; import NotificatorPlugin from '@/utils/plugins/notificator'; @@ -22,7 +21,6 @@ const pinia = createPinia(); setActivePinia(pinia); export function registerPlugins(app: App) { - loadFonts(); app .use(vuetify) .use(router) diff --git a/web/satellite/vuetify-poc/src/plugins/vuetify.ts b/web/satellite/vuetify-poc/src/plugins/vuetify.ts index 453fe5b08..3a80cb1d3 100644 --- a/web/satellite/vuetify-poc/src/plugins/vuetify.ts +++ b/web/satellite/vuetify-poc/src/plugins/vuetify.ts @@ -9,6 +9,7 @@ import 'vuetify/styles'; import '@mdi/font/css/materialdesignicons.css'; +import '@fontsource-variable/inter'; import { createVuetify } from 'vuetify'; import { md3 } from 'vuetify/blueprints'; diff --git a/web/satellite/vuetify-poc/src/plugins/webfontloader.ts b/web/satellite/vuetify-poc/src/plugins/webfontloader.ts deleted file mode 100644 index 90b95e983..000000000 --- a/web/satellite/vuetify-poc/src/plugins/webfontloader.ts +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2023 Storj Labs, Inc. -// See LICENSE for copying information. - -/** - * plugins/webfontloader.ts - * - * webfontloader documentation: https://github.com/typekit/webfontloader - */ - -export async function loadFonts () { - const webFontLoader = await import(/* webpackChunkName: "webfontloader" */'webfontloader'); - - webFontLoader.load({ - google: { - families: ['Inter:400,500,700&display=swap'], - }, - }); -} diff --git a/web/satellite/vuetify-poc/src/styles/settings.scss b/web/satellite/vuetify-poc/src/styles/settings.scss index d0277884c..0925e5e28 100644 --- a/web/satellite/vuetify-poc/src/styles/settings.scss +++ b/web/satellite/vuetify-poc/src/styles/settings.scss @@ -1,7 +1,7 @@ // Copyright (C) 2023 Storj Labs, Inc. // See LICENSE for copying information. -$font-family: 'Inter', sans-serif; +$font-family: 'Inter Variable', sans-serif; @use 'vuetify/settings' with ( $color-pack: false,