From bfaae99aafdc6e322e7a9c1656d23fb5c91d76fc Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 10 Jan 2025 07:24:19 +0530 Subject: [PATCH] Towards removing the global styles --- web/apps/accounts/src/pages/_app.tsx | 2 +- web/apps/auth/src/pages/_app.tsx | 2 +- web/apps/cast/src/pages/_app.tsx | 2 +- web/apps/photos/src/pages/_app.tsx | 2 +- web/docs/dependencies.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx index f828ecab03..55a45d61f1 100644 --- a/web/apps/accounts/src/pages/_app.tsx +++ b/web/apps/accounts/src/pages/_app.tsx @@ -8,6 +8,7 @@ import { useSetupI18n } from "@/base/components/utils/hooks-i18n"; import { getTheme, THEME_COLOR } from "@/base/components/utils/theme"; import { disableDiskLogs } from "@/base/log"; import { logUnhandledErrorsAndRejections } from "@/base/log-web"; +import "@fontsource-variable/inter"; import { CssBaseline } from "@mui/material"; import { ThemeProvider } from "@mui/material/styles"; import { t } from "i18next"; @@ -15,7 +16,6 @@ import type { AppProps } from "next/app"; import React, { useEffect, useMemo, useState } from "react"; import { AppContext } from "../types/context"; -import "@fontsource-variable/inter"; import "styles/global.css"; const App: React.FC = ({ Component, pageProps }) => { diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx index 67b72c3b82..05fa832c74 100644 --- a/web/apps/auth/src/pages/_app.tsx +++ b/web/apps/auth/src/pages/_app.tsx @@ -19,6 +19,7 @@ import { migrateKVToken, } from "@ente/shared/storage/localStorage"; import type { User } from "@ente/shared/user/types"; +import "@fontsource-variable/inter"; import { CssBaseline } from "@mui/material"; import { ThemeProvider } from "@mui/material/styles"; import { t } from "i18next"; @@ -27,7 +28,6 @@ import { useRouter } from "next/router"; import React, { useCallback, useEffect, useMemo, useState } from "react"; import { AppContext } from "types/context"; -import "@fontsource-variable/inter"; import "styles/global.css"; const App: React.FC = ({ Component, pageProps }) => { diff --git a/web/apps/cast/src/pages/_app.tsx b/web/apps/cast/src/pages/_app.tsx index b55da999a5..b2cbf17980 100644 --- a/web/apps/cast/src/pages/_app.tsx +++ b/web/apps/cast/src/pages/_app.tsx @@ -3,11 +3,11 @@ import { CustomHead } from "@/base/components/Head"; import { getTheme, THEME_COLOR } from "@/base/components/utils/theme"; import { disableDiskLogs } from "@/base/log"; import { logUnhandledErrorsAndRejections } from "@/base/log-web"; +import "@fontsource-variable/inter"; import { CssBaseline, ThemeProvider } from "@mui/material"; import type { AppProps } from "next/app"; import React, { useEffect } from "react"; -import "@fontsource-variable/inter"; import "styles/global.css"; const App: React.FC = ({ Component, pageProps }) => { diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index d1908fe8db..4f9fc8d072 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -34,6 +34,7 @@ import { migrateKVToken, } from "@ente/shared/storage/localStorage"; import type { User } from "@ente/shared/user/types"; +import "@fontsource-variable/inter"; import ArrowForwardIcon from "@mui/icons-material/ArrowForward"; import { CssBaseline, styled } from "@mui/material"; import { ThemeProvider } from "@mui/material/styles"; @@ -48,7 +49,6 @@ import { resumeExportsIfNeeded } from "services/export"; import { photosLogout } from "services/logout"; import { NotificationAttributes } from "types/Notification"; -import "@fontsource-variable/inter"; /* Inter Variable, supports weights 100-900 */ import "styles/global.css"; export default function App({ Component, pageProps }: AppProps) { diff --git a/web/docs/dependencies.md b/web/docs/dependencies.md index f4d2ac3e54..f93d08a2c6 100644 --- a/web/docs/dependencies.md +++ b/web/docs/dependencies.md @@ -144,8 +144,8 @@ For more details, see [translations.md](translations.md). ### Font -The app uses Inter as its primary font, via -[@fontsource-variable/inter](https://fontsource.org/fonts/inter/install). +Inter Variable (with support for weights 100 - 90) is used as the primary font, +via [@fontsource-variable/inter](https://fontsource.org/fonts/inter/install). ### UI components