Skip to content

armgit / ente

Public Imported from GitHub
0

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

fix(photos):refine-album-header-typography-and-icons

Aswin Asok5c70ebb9c32f
diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 1ac1775670..d5db82b235 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -126,6 +126,23 @@ export const CollectionHeader: React.FC<CollectionHeaderProps> = (props) => {
<SpacedRow>
<GalleryItemsSummary
name={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}
@@ -705,7 +722,10 @@ const CollectionHeaderOptions: React.FC<CollectionHeaderProps> = ({
<OverflowMenu
ariaID="collection-options"
triggerButtonIcon={
- <MoreHorizIcon ref={overflowMenuIconRef} />
+ <MoreHorizIcon
+ ref={overflowMenuIconRef}
+ sx={{ fontSize: 28 }}
+ />
}
>
{validMenuOptions}
@@ -872,8 +892,8 @@ type DownloadQuickOptionProps = OptionProps & {
const DownloadIcon: React.FC = () => (
<svg
- width="22"
- height="22"
+ width="26"
+ height="26"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
@@ -938,8 +958,8 @@ interface ShareQuickOptionProps {
const ShareIcon: React.FC = () => (
<svg
- width="21"
- height="19"
+ width="26"
+ height="24"
viewBox="0 0 22 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
diff --git a/web/packages/new/photos/components/gallery/ListHeader.tsx b/web/packages/new/photos/components/gallery/ListHeader.tsx
index e7fb1acdb9..3b38c70302 100644
--- a/web/packages/new/photos/components/gallery/ListHeader.tsx
+++ b/web/packages/new/photos/components/gallery/ListHeader.tsx
@@ -14,6 +14,8 @@ 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.
@@ -26,6 +28,8 @@ export const GalleryItemsSummary: React.FC<GalleryItemsSummaryProps> = ({
description,
descriptionMaxWidth,
nameProps,
+ countProps,
+ titleSpacing,
fileCount,
endIcon,
onNameClick,
@@ -42,9 +46,14 @@ export const GalleryItemsSummary: React.FC<GalleryItemsSummaryProps> = ({
gap: 1.5,
// Keep the header height stable without an end icon.
minHeight: "24px",
+ mt: titleSpacing,
}}
>
- <Typography variant="small" sx={{ color: "text.muted" }}>
+ <Typography
+ variant="small"
+ sx={{ color: "text.muted" }}
+ {...countProps}
+ >
{t("photos_count", { count: fileCount })}
</Typography>
{endIcon && (