From 5e13b6fcd4b76487609e96f17175a65a32901db4 Mon Sep 17 00:00:00 2001 From: Binarybaron Date: Wed, 20 Nov 2024 15:17:15 +0100 Subject: [PATCH] refactor(gui): Bundle roboto font directly from npm registry --- src-gui/index.html | 63 ++++++++++++------------- src-gui/package.json | 3 +- src-gui/src/renderer/components/App.tsx | 1 + src-gui/yarn.lock | 5 ++ 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src-gui/index.html b/src-gui/index.html index 94b9ba4e3..6780d6c8d 100644 --- a/src-gui/index.html +++ b/src-gui/index.html @@ -1,36 +1,35 @@ - - - - - - - -
- - - - + +
+ + + + + \ No newline at end of file diff --git a/src-gui/package.json b/src-gui/package.json index f609304a2..f6e02a560 100644 --- a/src-gui/package.json +++ b/src-gui/package.json @@ -15,6 +15,7 @@ "tauri": "tauri" }, "dependencies": { + "@fontsource/roboto": "^5.1.0", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", @@ -66,4 +67,4 @@ "vite-tsconfig-paths": "^4.3.2", "vitest": "^2.1.1" } -} \ No newline at end of file +} diff --git a/src-gui/src/renderer/components/App.tsx b/src-gui/src/renderer/components/App.tsx index f564b0fb2..893d6507f 100644 --- a/src-gui/src/renderer/components/App.tsx +++ b/src-gui/src/renderer/components/App.tsx @@ -13,6 +13,7 @@ import { useSettings } from "store/hooks"; import { themes } from "./theme"; import { useEffect } from "react"; import { setupBackgroundTasks } from "renderer/background"; +import "@fontsource/roboto"; const useStyles = makeStyles((theme) => ({ innerContent: { diff --git a/src-gui/yarn.lock b/src-gui/yarn.lock index 1eda4a1b7..574058fa7 100644 --- a/src-gui/yarn.lock +++ b/src-gui/yarn.lock @@ -399,6 +399,11 @@ resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== +"@fontsource/roboto@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-5.1.0.tgz#00230737ec09c60ae877a5e33d067c0607fdd5ba" + integrity sha512-cFRRC1s6RqPygeZ8Uw/acwVHqih8Czjt6Q0MwoUoDe9U3m4dH1HmNDRBZyqlMSFwgNAUKgFImncKdmDHyKpwdg== + "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"