diff --git a/dashboard/appstatus.html b/dashboard/appstatus.html index 3f42315c9..08d48e134 100644 --- a/dashboard/appstatus.html +++ b/dashboard/appstatus.html @@ -19,7 +19,7 @@ width: 100%; padding: 0; margin: 0; - font-family: "Noto Sans", Helvetica, Arial, sans-serif; + font-family: Inter, "Noto Sans", Helvetica, Arial, sans-serif; font-size: 16px; /* this also defines the overall widget size as all sizes are in rem */ font-weight: 400; } diff --git a/dashboard/notfound.html b/dashboard/notfound.html index 302638fbc..a650e28f4 100644 --- a/dashboard/notfound.html +++ b/dashboard/notfound.html @@ -19,7 +19,7 @@ width: 100%; padding: 0; margin: 0; - font-family: "Noto Sans", Helvetica, Arial, sans-serif; + font-family: Inter, "Noto Sans", Helvetica, Arial, sans-serif; font-size: 16px; /* this also defines the overall widget size as all sizes are in rem */ font-weight: 400; } diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index 9efed8257..ba15f2f4f 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -7,7 +7,7 @@ "": { "dependencies": { "@cloudron/pankow": "^3.2.4", - "@fontsource/noto-sans": "^5.2.7", + "@fontsource/inter": "^5.2.6", "@fortawesome/fontawesome-free": "^7.0.0", "@vitejs/plugin-vue": "^6.0.1", "@xterm/addon-attach": "^0.11.0", @@ -631,15 +631,6 @@ "url": "https://github.com/sponsors/ayuhito" } }, - "node_modules/@fontsource/noto-sans": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-5.2.7.tgz", - "integrity": "sha512-mTpMSMft6Nb+ZSF4DSiJVYnLzKCRjHNFieZ/swuxSDQK+v1hjUeDTBxLHKUdfmC+ZPg6TUEWw4oRq2ltnDbSjQ==", - "license": "OFL-1.1", - "funding": { - "url": "https://github.com/sponsors/ayuhito" - } - }, "node_modules/@fortawesome/fontawesome-free": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.0.tgz", @@ -3238,11 +3229,6 @@ "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.2.6.tgz", "integrity": "sha512-CZs9S1CrjD0jPwsNy9W6j0BhsmRSQrgwlTNkgQXTsAeDRM42LBRLo3eo9gCzfH4GvV7zpyf78Ozfl773826csw==" }, - "@fontsource/noto-sans": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@fontsource/noto-sans/-/noto-sans-5.2.7.tgz", - "integrity": "sha512-mTpMSMft6Nb+ZSF4DSiJVYnLzKCRjHNFieZ/swuxSDQK+v1hjUeDTBxLHKUdfmC+ZPg6TUEWw4oRq2ltnDbSjQ==" - }, "@fortawesome/fontawesome-free": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.0.tgz", diff --git a/dashboard/package.json b/dashboard/package.json index 3cb452813..eac35aa05 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -8,7 +8,7 @@ "type": "module", "dependencies": { "@cloudron/pankow": "^3.2.4", - "@fontsource/noto-sans": "^5.2.7", + "@fontsource/inter": "^5.2.6", "@fortawesome/fontawesome-free": "^7.0.0", "@vitejs/plugin-vue": "^6.0.1", "@xterm/addon-attach": "^0.11.0", diff --git a/dashboard/src/activation.js b/dashboard/src/activation.js index f7b8f5d33..f58859a45 100644 --- a/dashboard/src/activation.js +++ b/dashboard/src/activation.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import ActivationView from './views/ActivationView.vue'; diff --git a/dashboard/src/filemanager.js b/dashboard/src/filemanager.js index 67fdbf3dd..c7a42719d 100644 --- a/dashboard/src/filemanager.js +++ b/dashboard/src/filemanager.js @@ -1,11 +1,14 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; + +import '@fontsource/inter'; + import { createRouter, createWebHashHistory } from 'vue-router'; import { tooltip } from '@cloudron/pankow'; import i18n from './i18n.js'; import FileManager from './components/FileManager.vue'; import FolderView from './components/FolderView.vue'; import FileViewer from './components/FileViewer.vue'; + import './style.css'; const routes = [ diff --git a/dashboard/src/index.js b/dashboard/src/index.js index 560c14a4b..f9049876f 100644 --- a/dashboard/src/index.js +++ b/dashboard/src/index.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import { tooltip, fallbackImage } from '@cloudron/pankow'; diff --git a/dashboard/src/login.js b/dashboard/src/login.js index 1c3de3e5b..0d87cabc9 100644 --- a/dashboard/src/login.js +++ b/dashboard/src/login.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import LoginView from './views/LoginView.vue'; diff --git a/dashboard/src/logs.js b/dashboard/src/logs.js index cc800688d..bbbbbcbc4 100644 --- a/dashboard/src/logs.js +++ b/dashboard/src/logs.js @@ -1,8 +1,11 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; + +import '@fontsource/inter'; + import { tooltip } from '@cloudron/pankow'; import i18n from './i18n.js'; import LogsViewer from './components/LogsViewer.vue'; + import './style.css'; (async function init() { diff --git a/dashboard/src/oidcerror.js b/dashboard/src/oidcerror.js index 58474b41b..d976e15de 100644 --- a/dashboard/src/oidcerror.js +++ b/dashboard/src/oidcerror.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import OidcErrorView from './views/OidcErrorView.vue'; diff --git a/dashboard/src/oidcinteractionabort.js b/dashboard/src/oidcinteractionabort.js index 317903668..dbb6f9c45 100644 --- a/dashboard/src/oidcinteractionabort.js +++ b/dashboard/src/oidcinteractionabort.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import OidcInteractionAbortView from './views/OidcInteractionAbortView.vue'; diff --git a/dashboard/src/passwordreset.js b/dashboard/src/passwordreset.js index 9231a8746..875f0e4f7 100644 --- a/dashboard/src/passwordreset.js +++ b/dashboard/src/passwordreset.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import PasswordResetView from './views/PasswordResetView.vue'; diff --git a/dashboard/src/proxyauth.js b/dashboard/src/proxyauth.js index 456d99926..0e04fd922 100644 --- a/dashboard/src/proxyauth.js +++ b/dashboard/src/proxyauth.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import '@cloudron/pankow/style.css'; diff --git a/dashboard/src/restore.js b/dashboard/src/restore.js index 92dac573d..2db53d3b1 100644 --- a/dashboard/src/restore.js +++ b/dashboard/src/restore.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import RestoreView from './views/RestoreView.vue'; diff --git a/dashboard/src/setup.js b/dashboard/src/setup.js index e46e2426e..a5f867317 100644 --- a/dashboard/src/setup.js +++ b/dashboard/src/setup.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import SetupView from './views/SetupView.vue'; diff --git a/dashboard/src/setupaccount.js b/dashboard/src/setupaccount.js index ebf9f8b10..a2ea4e06e 100644 --- a/dashboard/src/setupaccount.js +++ b/dashboard/src/setupaccount.js @@ -1,6 +1,6 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; +import '@fontsource/inter'; import i18n from './i18n.js'; import SetupAccount from './components/SetupAccount.vue'; diff --git a/dashboard/src/style.css b/dashboard/src/style.css index 8e16d3a1e..4c9f953b7 100644 --- a/dashboard/src/style.css +++ b/dashboard/src/style.css @@ -1,6 +1,6 @@ :root { - --font-family: "Noto Sans",Helvetica,Arial,sans-serif; - --font-family--header: "Noto Sans Light",Helvetica,Arial,sans-serif; + --font-family: Inter,Helvetica,Arial,sans-serif; + --font-family--header: Inter,Helvetica,Arial,sans-serif; --card-background: #f7f7f8; --navbar-background: #f3f4f6; --pankow-text-color: black; diff --git a/dashboard/src/terminal.js b/dashboard/src/terminal.js index add6f4ac4..c586a559f 100644 --- a/dashboard/src/terminal.js +++ b/dashboard/src/terminal.js @@ -1,8 +1,11 @@ import { createApp } from 'vue'; -import '@fontsource/noto-sans'; + +import '@fontsource/inter'; + import { tooltip } from '@cloudron/pankow'; import i18n from './i18n.js'; import Terminal from './components/Terminal.vue'; + import './style.css'; (async function init() {