Skip to content

armgit / ente

Public Imported from GitHub
0

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

Polish Space messages and profile layouts

Anand Baburajanf38440bd2ebe
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index f93f015d52..536604e728 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -525,6 +525,12 @@ const ConversationListItem: React.FC<{
width: "calc(100% + 16px)",
"&:active": { bgcolor: spaceDialogBackground },
"&:hover": { bgcolor: spaceDialogBackground },
+ "&:has(> [data-space-row-action]:active)": {
+ bgcolor: "transparent",
+ },
+ "&:has(> [data-space-row-action]:hover)": {
+ bgcolor: "transparent",
+ },
}}
>
<Box
@@ -755,6 +761,7 @@ const ConversationListItem: React.FC<{
className="green-bg"
component="button"
type="button"
+ data-space-row-action
onClick={onPostSomething}
sx={{
bgcolor: green,
@@ -2527,7 +2534,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
{replyingTo && (
<Box
sx={{
- bgcolor: lightSurface,
+ bgcolor: spaceDialogBackground,
borderLeft: `3px solid ${green}`,
borderRadius: "12px",
boxSizing: "border-box",
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index 76aa05074f..2c36f7594d 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -661,11 +661,10 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
);
const masonryColumns = buildPostMasonryColumns(masonryTiles);
const usesAdaptiveMasonryRows = isOwnerProfile || isFriendProfile;
- const usesSparseProfileLayout =
- masonryTiles.length > 0 && masonryTiles.length <= 3;
+ const usesSinglePostLayout = masonryTiles.length == 1;
const usesFullWidthPostRows =
- usesAdaptiveMasonryRows || usesSparseProfileLayout;
- const adaptiveMasonryRows = usesSparseProfileLayout
+ usesAdaptiveMasonryRows || usesSinglePostLayout;
+ const adaptiveMasonryRows = usesSinglePostLayout
? masonryTiles.map((tile) => [tile])
: buildAdaptivePostMasonryRows(masonryTiles);
const closeFriendActions = () => setFriendActionsAnchor(null);
@@ -1833,7 +1832,7 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
flex: hasProfilePosts ? "0 0 auto" : "1 1 0",
flexDirection: "column",
minHeight: hasProfilePosts ? undefined : 0,
- mt: "32px",
+ mt: usesSinglePostLayout ? "20px" : "32px",
pb: usesFullWidthPostRows ? 0 : "16px",
px: 0,
width: "100%",
@@ -1850,14 +1849,12 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
: undefined,
display: "grid",
gap: usesFullWidthPostRows
- ? usesSparseProfileLayout
- ? photoMasonryGap
- : adaptivePhotoMasonryGap
+ ? adaptivePhotoMasonryGap
: photoMasonryGap,
gridTemplateColumns: usesFullWidthPostRows
? "minmax(0, 1fr)"
: `repeat(${masonryColumns.length}, minmax(0, 1fr))`,
- mt: "6px",
+ mt: usesSinglePostLayout ? "4px" : "6px",
mx: usesFullWidthPostRows ? 0 : "16px",
overflow: usesFullWidthPostRows
? "hidden"
@@ -1891,10 +1888,10 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
{tiles.map((tile) =>
renderPostTile(
tile,
- usesSparseProfileLayout
+ usesSinglePostLayout
? photoMasonryRadius
: 0,
- usesSparseProfileLayout
+ usesSinglePostLayout
? Math.min(
tile.aspectRatio,
1,