π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos):share-heading-styles-across-gallery-consumers
Aswin Asok6d76e2933bd8
diff --git a/web/apps/embed/package.json b/web/apps/embed/package.jsonindex e0c5bb12d1..3c9aa9c925 100644--- a/web/apps/embed/package.json+++ b/web/apps/embed/package.json@@ -3,6 +3,7 @@"version": "0.0.0","private": true,"dependencies": {+ "@fontsource-variable/outfit": "5.3.0","ente-accounts": "*","ente-base": "*","ente-gallery": "*",diff --git a/web/apps/embed/src/pages/_app.tsx b/web/apps/embed/src/pages/_app.tsxindex 7463b71949..9b3d1e912b 100644--- a/web/apps/embed/src/pages/_app.tsx+++ b/web/apps/embed/src/pages/_app.tsx@@ -1,4 +1,5 @@import "@fontsource-variable/inter";+import "@fontsource-variable/outfit";import { CssBaseline } from "@mui/material";import { ThemeProvider } from "@mui/material/styles";import { CustomHead } from "ente-base/components/Head";diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsxindex d5db82b235..13c037753d 100644--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx@@ -126,23 +126,6 @@ export const CollectionHeader: React.FC<CollectionHeaderProps> = (props) => {<SpacedRow><GalleryItemsSummaryname={name}- nameProps={{- sx: {- fontFamily: '"Outfit Variable", Outfit, sans-serif',- fontWeight: 600,- fontSize: "24px",- lineHeight: "32px",- },- }}- countProps={{- sx: {- color: "text.muted",- fontSize: "14px",- fontWeight: 500,- lineHeight: "18px",- },- }}- titleSpacing={0.25}description={description}descriptionMaxWidth={480}fileCount={fileCount}diff --git a/web/package-lock.json b/web/package-lock.jsonindex 09adb8a9b5..5566676ba3 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -137,6 +137,7 @@"apps/embed": {"version": "0.0.0","dependencies": {+ "@fontsource-variable/outfit": "5.3.0","ente-accounts": "*","ente-base": "*","ente-gallery": "*",diff --git a/web/packages/new/photos/components/gallery/ListHeader.tsx b/web/packages/new/photos/components/gallery/ListHeader.tsxindex 3b38c70302..c4f0b0bc94 100644--- a/web/packages/new/photos/components/gallery/ListHeader.tsx+++ b/web/packages/new/photos/components/gallery/ListHeader.tsx@@ -14,8 +14,6 @@ interface GalleryItemsSummaryProps {description?: string;descriptionMaxWidth?: number;nameProps?: TypographyProps;- countProps?: TypographyProps;- titleSpacing?: number;fileCount: number;endIcon?: React.ReactNode;// This cannot be the only way to invoke the action; it is mouse-only.@@ -28,15 +26,30 @@ export const GalleryItemsSummary: React.FC<GalleryItemsSummaryProps> = ({description,descriptionMaxWidth,nameProps,- countProps,- titleSpacing,fileCount,endIcon,onNameClick,onDescriptionHeightChange,}) => (<Box sx={{ minWidth: 0 }}>- <Typography variant="h3" {...(nameProps ?? {})} onClick={onNameClick}>+ <Typography+ variant="h3"+ {...(nameProps ?? {})}+ sx={[+ {+ fontFamily: '"Outfit Variable", Outfit, sans-serif',+ fontWeight: 600,+ fontSize: "24px",+ lineHeight: "32px",+ },+ ...(nameProps?.sx+ ? isSxArray(nameProps.sx)+ ? nameProps.sx+ : [nameProps.sx]+ : []),+ ]}+ onClick={onNameClick}+ >{name}</Typography>@@ -46,13 +59,17 @@ export const GalleryItemsSummary: React.FC<GalleryItemsSummaryProps> = ({gap: 1.5,// Keep the header height stable without an end icon.minHeight: "24px",- mt: titleSpacing,+ mt: "4px",}}><Typographyvariant="small"- sx={{ color: "text.muted" }}- {...countProps}+ sx={{+ color: "text.muted",+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "18px",+ }}>{t("photos_count", { count: fileCount })}</Typography>