From 27234a5a684c2f73ce9eb65d916543c843f20388 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 25 Nov 2024 18:58:37 +0000
Subject: [PATCH] Switch to less broken imports

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 res/themes/dark/css/dark.pcss                 |  1 -
 res/themes/legacy-light/css/_fonts.pcss       |  4 ----
 .../css/light-high-contrast.pcss              |  1 -
 res/themes/light/css/_fonts.pcss              | 20 -------------------
 res/themes/light/css/light.pcss               |  1 -
 src/theme.ts                                  | 14 +++++++++++++
 6 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 res/themes/light/css/_fonts.pcss

diff --git a/res/themes/dark/css/dark.pcss b/res/themes/dark/css/dark.pcss
index 51262598be..4680b273fa 100644
--- a/res/themes/dark/css/dark.pcss
+++ b/res/themes/dark/css/dark.pcss
@@ -1,6 +1,5 @@
 @import "../../../../res/css/_font-sizes.pcss";
 @import "../../light/css/_paths.pcss";
-@import "../../light/css/_fonts.pcss";
 @import "../../light/css/_light.pcss";
 @import "_dark.pcss";
 @import "../../light/css/_mods.pcss";
diff --git a/res/themes/legacy-light/css/_fonts.pcss b/res/themes/legacy-light/css/_fonts.pcss
index bc65ec2d6e..7f6e7ed008 100644
--- a/res/themes/legacy-light/css/_fonts.pcss
+++ b/res/themes/legacy-light/css/_fonts.pcss
@@ -12,10 +12,6 @@
  * and it's better to rely on the browser's built-in obliquing behaviour.
  */
 
-/* Grab the other fonts from the current theme, so we can override to Inter */
-/* in custom fonts if needed. */
-@import "../../light/css/_fonts.pcss";
-
 /* Nunito as the default, for old time's sake on legacy themes. */
 /* the 'src' links are relative to the bundle.css, which is in a subdirectory.
  */
diff --git a/res/themes/light-high-contrast/css/light-high-contrast.pcss b/res/themes/light-high-contrast/css/light-high-contrast.pcss
index a843809e51..23bf5111a5 100644
--- a/res/themes/light-high-contrast/css/light-high-contrast.pcss
+++ b/res/themes/light-high-contrast/css/light-high-contrast.pcss
@@ -1,6 +1,5 @@
 @import "../../../../res/css/_font-sizes.pcss";
 @import "../../light/css/_paths.pcss";
-@import "../../light/css/_fonts.pcss";
 @import "../../light/css/_light.pcss";
 @import "_light-high-contrast.pcss";
 @import "../../light/css/_mods.pcss";
diff --git a/res/themes/light/css/_fonts.pcss b/res/themes/light/css/_fonts.pcss
deleted file mode 100644
index 662df19b54..0000000000
--- a/res/themes/light/css/_fonts.pcss
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
-Please see LICENSE files in the repository root for full details.
-*/
-
-@import url("@fontsource/inter/400.css");
-@import url("@fontsource/inter/400-italic.css");
-@import url("@fontsource/inter/500.css");
-@import url("@fontsource/inter/500-italic.css");
-@import url("@fontsource/inter/600.css");
-@import url("@fontsource/inter/600-italic.css");
-@import url("@fontsource/inter/700.css");
-@import url("@fontsource/inter/700-italic.css");
-
-@import url("@fontsource/inconsolata/latin-ext-400.css");
-@import url("@fontsource/inconsolata/latin-400.css");
-@import url("@fontsource/inconsolata/latin-ext-700.css");
-@import url("@fontsource/inconsolata/latin-700.css");
diff --git a/res/themes/light/css/light.pcss b/res/themes/light/css/light.pcss
index d3264e491e..8c6e9b2730 100644
--- a/res/themes/light/css/light.pcss
+++ b/res/themes/light/css/light.pcss
@@ -1,6 +1,5 @@
 @import "../../../../res/css/_font-sizes.pcss";
 @import "_paths.pcss";
-@import "_fonts.pcss";
 @import "_light.pcss";
 @import "_mods.pcss";
 @import "../../../../res/css/_components.pcss";
diff --git a/src/theme.ts b/src/theme.ts
index c0fb087159..94ae7cb6e4 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -7,6 +7,20 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
 Please see LICENSE files in the repository root for full details.
 */
 
+import "@fontsource/inter/400.css";
+import "@fontsource/inter/400-italic.css";
+import "@fontsource/inter/500.css";
+import "@fontsource/inter/500-italic.css";
+import "@fontsource/inter/600.css";
+import "@fontsource/inter/600-italic.css";
+import "@fontsource/inter/700.css";
+import "@fontsource/inter/700-italic.css";
+
+import "@fontsource/inconsolata/latin-ext-400.css";
+import "@fontsource/inconsolata/latin-400.css";
+import "@fontsource/inconsolata/latin-ext-700.css";
+import "@fontsource/inconsolata/latin-700.css";
+
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "./languageHandler";