imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to less broken imports

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2024-11-25 18:58:37 +00:00
parent 5c2fe6a4ee
commit 27234a5a68
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
6 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/themes/dark/css/dark.pcss
View file

@ -1,6 +1,5 @@
@import "../../../../res/css/_font-sizes.pcss"; @import "../../../../res/css/_font-sizes.pcss";
@import "../../light/css/_paths.pcss"; @import "../../light/css/_paths.pcss";
@import "../../light/css/_fonts.pcss";
@import "../../light/css/_light.pcss"; @import "../../light/css/_light.pcss";
@import "_dark.pcss"; @import "_dark.pcss";
@import "../../light/css/_mods.pcss"; @import "../../light/css/_mods.pcss";

4
res/themes/legacy-light/css/_fonts.pcss
View file

@ -12,10 +12,6 @@
* and it's better to rely on the browser's built-in obliquing behaviour. * 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. */ /* 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. /* the 'src' links are relative to the bundle.css, which is in a subdirectory.
*/ */

1
res/themes/light-high-contrast/css/light-high-contrast.pcss
View file

@ -1,6 +1,5 @@
@import "../../../../res/css/_font-sizes.pcss"; @import "../../../../res/css/_font-sizes.pcss";
@import "../../light/css/_paths.pcss"; @import "../../light/css/_paths.pcss";
@import "../../light/css/_fonts.pcss";
@import "../../light/css/_light.pcss"; @import "../../light/css/_light.pcss";
@import "_light-high-contrast.pcss"; @import "_light-high-contrast.pcss";
@import "../../light/css/_mods.pcss"; @import "../../light/css/_mods.pcss";

20
res/themes/light/css/_fonts.pcss
View file

@ -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");

1
res/themes/light/css/light.pcss
View file

@ -1,6 +1,5 @@
@import "../../../../res/css/_font-sizes.pcss"; @import "../../../../res/css/_font-sizes.pcss";
@import "_paths.pcss"; @import "_paths.pcss";
@import "_fonts.pcss";
@import "_light.pcss"; @import "_light.pcss";
@import "_mods.pcss"; @import "_mods.pcss";
@import "../../../../res/css/_components.pcss"; @import "../../../../res/css/_components.pcss";

14
src/theme.ts
View file

@ -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. 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 { logger } from "matrix-js-sdk/src/logger";
import { _t } from "./languageHandler"; import { _t } from "./languageHandler";