Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[web][photos] Match Figma dialog typography and fix lint

AswinAsok2bdc6c53dd35
diff --git a/web/apps/photos/vitest.config.ts b/web/apps/photos/vitest.config.ts
index df521d1935..51e689a419 100644
--- a/web/apps/photos/vitest.config.ts
+++ b/web/apps/photos/vitest.config.ts
@@ -1,6 +1,7 @@
import { defineConfig } from "vitest/config";
export default defineConfig({
+ test: { include: ["tests/**/*.test.{ts,tsx}"] },
// Next preserves JSX for its own compiler; component tests need it compiled.
oxc: { jsx: { runtime: "automatic" } },
});
diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsx
index 59266b1b15..740c73b8d5 100644
--- a/web/packages/base/components/MiniDialog.tsx
+++ b/web/packages/base/components/MiniDialog.tsx
@@ -41,7 +41,7 @@ export interface MiniDialogAttributes {
type MiniDialogProps = Pick<DialogProps, "open" | "sx"> & {
appearance?: "default" | "centered";
- /** A new request remounts the content to reset pending/error state. */
+ // A new request remounts the content to reset pending/error state.
dialogID?: number;
onClose: () => void;
attributes?: MiniDialogAttributes;
@@ -172,7 +172,19 @@ const MiniDialogContent: React.FC<React.PropsWithChildren<MiniDialogProps>> = ({
borderRadius: "24px",
position: "relative",
textAlign: "center",
+ fontFamily: '"Inter Variable", sans-serif',
+ "& .MuiDialogContent-root, & .MuiDialogContent-root .MuiTypography-root":
+ {
+ fontSize: "14px",
+ lineHeight: "20px",
+ fontWeight: 500,
+ letterSpacing: 0,
+ },
"& .MuiButton-root": {
+ fontFamily: "inherit",
+ fontSize: "14px",
+ lineHeight: "20px",
+ letterSpacing: 0,
fontWeight: 500,
minHeight: "48px",
padding: "14px 24px",
@@ -224,7 +236,14 @@ const MiniDialogContent: React.FC<React.PropsWithChildren<MiniDialogProps>> = ({
{attributes.title && (
<DialogTitle
id={titleID}
- sx={{ "&&&": { p: 0 }, fontSize: 20 }}
+ sx={{
+ "&&&": { p: 0 },
+ fontFamily: '"Outfit Variable", sans-serif',
+ fontSize: "24px",
+ lineHeight: "32px",
+ fontWeight: 600,
+ letterSpacing: 0,
+ }}
>
{attributes.title}
</DialogTitle>
diff --git a/web/packages/base/components/utils/mini-dialog-state.ts b/web/packages/base/components/utils/mini-dialog-state.ts
index a2cc93811f..e326b2d021 100644
--- a/web/packages/base/components/utils/mini-dialog-state.ts
+++ b/web/packages/base/components/utils/mini-dialog-state.ts
@@ -1,6 +1,6 @@
import type { MiniDialogAttributes } from "../MiniDialog";
-export interface MiniDialogState {
+interface MiniDialogState {
open: boolean;
attributes?: MiniDialogAttributes;
id: number;