devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases Wiki Activity

fix(web): flat separators with wrapper divs, first-row border, DM sidebar title case

Browse Source 
- FriendItem/RequestItem: add plain wrapper div so divide-y border
  lands on a non-rounded element (fixes curved separator lines)
- Add border-t to divide-y containers so first row also gets top line
- Remove uppercase from "Direct Messages" in DM sidebar
This commit is contained in:
Jannis Braun
2026-04-03 00:58:03 +02:00
parent e16cedded7
commit 23517447c3
2 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/src/components/chat/FriendsPage.tsx
+43 -39
View File
@@ -100,7 +100,7 @@ export function FriendsPage({ mobile }: FriendsPageProps) {
<p className="text-txt-tertiary text-sm">No one's online right now.</p> <p className="text-txt-tertiary text-sm">No one's online right now.</p>
</div> </div>
) : ( ) : (
<div className="divide-y divide-interactive-muted"> <div className="divide-y divide-interactive-muted border-t border-interactive-muted">
{onlineFriends.map(friend => ( {onlineFriends.map(friend => (
<FriendItem key={`${friend.id}:${friend._instanceOrigin}`} friend={friend} onRemove={() => setPendingUnfriend({ id: friend.id, name: friend.displayName ?? parseFederatedUsername(friend.username).baseName })} onDm={() => handleOpenDm(friend.id, friend.homeUserId ?? undefined, friend.homeInstance)} /> <FriendItem key={`${friend.id}:${friend._instanceOrigin}`} friend={friend} onRemove={() => setPendingUnfriend({ id: friend.id, name: friend.displayName ?? parseFederatedUsername(friend.username).baseName })} onDm={() => handleOpenDm(friend.id, friend.homeUserId ?? undefined, friend.homeInstance)} />
))} ))}
@@ -120,7 +120,7 @@ export function FriendsPage({ mobile }: FriendsPageProps) {
<p className="text-txt-tertiary text-sm">No friends yet — add someone!</p> <p className="text-txt-tertiary text-sm">No friends yet — add someone!</p>
</div> </div>
) : ( ) : (
<div className="divide-y divide-interactive-muted"> <div className="divide-y divide-interactive-muted border-t border-interactive-muted">
{friends.map(friend => ( {friends.map(friend => (
<FriendItem key={`${friend.id}:${friend._instanceOrigin}`} friend={friend} onRemove={() => setPendingUnfriend({ id: friend.id, name: friend.displayName ?? parseFederatedUsername(friend.username).baseName })} onDm={() => handleOpenDm(friend.id, friend.homeUserId ?? undefined, friend.homeInstance)} /> <FriendItem key={`${friend.id}:${friend._instanceOrigin}`} friend={friend} onRemove={() => setPendingUnfriend({ id: friend.id, name: friend.displayName ?? parseFederatedUsername(friend.username).baseName })} onDm={() => handleOpenDm(friend.id, friend.homeUserId ?? undefined, friend.homeInstance)} />
))} ))}
@@ -140,7 +140,7 @@ export function FriendsPage({ mobile }: FriendsPageProps) {
<p className="text-txt-tertiary text-sm">No pending requests — Nori is napping.</p> <p className="text-txt-tertiary text-sm">No pending requests — Nori is napping.</p>
</div> </div>
) : ( ) : (
<div className="divide-y divide-interactive-muted"> <div className="divide-y divide-interactive-muted border-t border-interactive-muted">
{pendingIncoming.map(req => ( {pendingIncoming.map(req => (
<RequestItem <RequestItem
key={`${req.id}:${req._instanceOrigin}`} key={`${req.id}:${req._instanceOrigin}`}
@@ -911,41 +911,43 @@ function FriendItem({ friend, onRemove, onDm }: { friend: TaggedFriend, onRemove
const { baseName: friendBaseName } = parseFederatedUsername(friend.username); const { baseName: friendBaseName } = parseFederatedUsername(friend.username);
const friendDisplayName = friend.displayName ?? friendBaseName; const friendDisplayName = friend.displayName ?? friendBaseName;
return ( return (
<div className="flex items-center justify-between px-3 h-[62px] rounded-[8px] hover:bg-interactive-hover group transition-colors mx-2"> <div className="px-2">
<div className="flex items-center gap-3"> <div className="flex items-center justify-between px-1 h-[62px] rounded-[8px] hover:bg-interactive-hover group transition-colors">
<Avatar src={friend.avatar} name={friendDisplayName} size={32} status={friend.status} userId={friend.homeUserId ?? friend.id} avatarColor={friend.avatarColor} /> <div className="flex items-center gap-3 pl-2">
<div className="flex flex-col leading-tight"> <Avatar src={friend.avatar} name={friendDisplayName} size={32} status={friend.status} userId={friend.homeUserId ?? friend.id} avatarColor={friend.avatarColor} />
<div className="flex items-center gap-1.5"> <div className="flex flex-col leading-tight">
<span className="text-txt-primary font-semibold text-[15px]">{friendDisplayName}</span> <div className="flex items-center gap-1.5">
<span className="text-txt-tertiary text-[13px] opacity-60 group-hover:opacity-100 transition-opacity font-medium">@{friend.username}</span> <span className="text-txt-primary font-semibold text-[15px]">{friendDisplayName}</span>
</div> <span className="text-txt-tertiary text-[13px] opacity-60 group-hover:opacity-100 transition-opacity font-medium">@{friend.username}</span>
<div className="flex items-center gap-1.5"> </div>
<span className="text-[12px] text-txt-tertiary font-medium">{statusLabel[friend.status] ?? friend.status}</span> <div className="flex items-center gap-1.5">
{instanceLabel && ( <span className="text-[12px] text-txt-tertiary font-medium">{statusLabel[friend.status] ?? friend.status}</span>
<span className="text-[11px] text-txt-tertiary/60 font-medium">via {instanceLabel}</span> {instanceLabel && (
)} <span className="text-[11px] text-txt-tertiary/60 font-medium">via {instanceLabel}</span>
)}
</div>
</div> </div>
</div> </div>
</div> <div className="flex items-center gap-2 opacity-60 group-hover:opacity-100 transition-opacity pr-2">
<div className="flex items-center gap-2 opacity-60 group-hover:opacity-100 transition-opacity pr-2"> <button
<button onClick={(e) => { e.stopPropagation(); onDm(); }}
onClick={(e) => { e.stopPropagation(); onDm(); }} className="w-9 h-9 flex items-center justify-center bg-surface-base rounded-full text-txt-tertiary hover:text-txt-primary transition-colors"
className="w-9 h-9 flex items-center justify-center bg-surface-base rounded-full text-txt-tertiary hover:text-txt-primary transition-colors" title="Message"
title="Message" >
> <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor"> <path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM6 9h12v2H6V9zm8 5H6v-2h8v2zm4-5H6V7h12v2z" />
<path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM6 9h12v2H6V9zm8 5H6v-2h8v2zm4-5H6V7h12v2z" /> </svg>
</svg> </button>
</button> <button
<button onClick={(e) => { e.stopPropagation(); onRemove(); }}
onClick={(e) => { e.stopPropagation(); onRemove(); }} className="w-9 h-9 flex items-center justify-center bg-surface-base rounded-full text-txt-tertiary hover:text-txt-danger transition-colors"
className="w-9 h-9 flex items-center justify-center bg-surface-base rounded-full text-txt-tertiary hover:text-txt-danger transition-colors" title="Remove Friend"
title="Remove Friend" >
> <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor"> <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />
<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" /> </svg>
</svg> </button>
</button> </div>
</div> </div>
</div> </div>
); );
@@ -965,9 +967,10 @@ function RequestItem({ request, type, onAccept, onDecline, onCancel }: {
const reqDisplayName = user.displayName ?? reqBaseName; const reqDisplayName = user.displayName ?? reqBaseName;
return ( return (
<div className="flex items-center justify-between px-3 py-2.5 rounded-lg hover:bg-interactive-hover group transition-colors mx-2"> <div className="px-2">
<div className="flex items-center gap-3"> <div className="flex items-center justify-between px-1 py-2.5 rounded-lg hover:bg-interactive-hover group transition-colors">
<Avatar src={user.avatar} name={reqDisplayName} size={32} status={user.status as any} userId={user.homeUserId ?? user.id} avatarColor={user.avatarColor} /> <div className="flex items-center gap-3 pl-2">
<Avatar src={user.avatar} name={reqDisplayName} size={32} status={user.status as any} userId={user.homeUserId ?? user.id} avatarColor={user.avatarColor} />
<div className="flex flex-col"> <div className="flex flex-col">
<div className="flex items-center gap-1.5"> <div className="flex items-center gap-1.5">
<span className="text-txt-primary font-bold text-sm">{reqDisplayName}</span> <span className="text-txt-primary font-bold text-sm">{reqDisplayName}</span>
@@ -1014,6 +1017,7 @@ function RequestItem({ request, type, onAccept, onDecline, onCancel }: {
</svg> </svg>
</button> </button>
)} )}
</div>
</div> </div>
</div> </div>
); );
packages/web/src/components/layout/ChannelSidebar.tsx
+1 -1
View File
@@ -472,7 +472,7 @@ export function ChannelSidebar() {
</div> </div>
<div className="mt-[18px] px-2 mb-1 flex items-center justify-between group"> <div className="mt-[18px] px-2 mb-1 flex items-center justify-between group">
<span className="text-[12px] font-bold text-txt-tertiary uppercase tracking-wider">Direct Messages</span> <span className="text-[12px] font-bold text-txt-tertiary tracking-wider">Direct Messages</span>
<button <button
onClick={() => openModal('newDm')} onClick={() => openModal('newDm')}
className="text-txt-tertiary hover:text-txt-primary transition-colors" className="text-txt-tertiary hover:text-txt-primary transition-colors"