ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Group Badge: Fix margin between Boost icoon and badge (#6821)

Browse Source
This commit is contained in:
Alexander Zinchuk 2026-03-31 11:29:38 +02:00
parent 992d8d6b2f
commit 4f5bfe684d
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/components/middle/message/Message.tsx
View File

@ -1734,25 +1734,29 @@ const Message = ({
</span> </span>
)} )}
<div className="title-spacer" /> <div className="title-spacer" />
{(!shouldSkipRenderAdminTitle && !signature) ? (forwardInfo?.isLinkedChannelPost ? ( {((!shouldSkipRenderAdminTitle && !signature) || canShowSenderBoosts) && (
<span className="admin-title" dir="auto">{oldLang('DiscussChannel')}</span> <span className="message-title-meta">
) : message.postAuthorTitle && isGroup && !asForwarded ? ( {(!shouldSkipRenderAdminTitle && !signature) ? (forwardInfo?.isLinkedChannelPost ? (
<span className="admin-title" dir="auto">{message.postAuthorTitle}</span> <span className="admin-title" dir="auto">{oldLang('DiscussChannel')}</span>
) : (senderChatMember || fromRank) && !asForwarded ? ( ) : message.postAuthorTitle && isGroup && !asForwarded ? (
<RankBadge <span className="admin-title" dir="auto">{message.postAuthorTitle}</span>
chatId={chatId} ) : (senderChatMember || fromRank) && !asForwarded ? (
userId={(senderChatMember?.userId || sender?.id)!} <RankBadge
isAdmin={senderChatMember?.isAdmin} chatId={chatId}
isOwner={senderChatMember?.isOwner} userId={(senderChatMember?.userId || sender?.id)!}
rank={senderChatMember?.rank || fromRank} isAdmin={senderChatMember?.isAdmin}
className="admin-title-badge" isOwner={senderChatMember?.isOwner}
isClickable rank={senderChatMember?.rank || fromRank}
/> className="admin-title-badge"
) : undefined) : undefined} isClickable
{canShowSenderBoosts && ( />
<span className="sender-boosts" aria-hidden> ) : undefined) : undefined}
<Icon name={senderBoosts > 1 ? 'boosts' : 'boost'} /> {canShowSenderBoosts && (
{senderBoosts > 1 ? senderBoosts : undefined} <span className="sender-boosts" aria-hidden>
<Icon name={senderBoosts > 1 ? 'boosts' : 'boost'} />
{senderBoosts > 1 ? senderBoosts : undefined}
</span>
)}
</span> </span>
)} )}
</div> </div>

21
src/components/middle/message/_message-content.scss
View File

@ -398,9 +398,21 @@
flex-grow: 1; flex-grow: 1;
} }
.message-title-meta {
user-select: none;
display: flex;
align-items: center;
gap: 0.25rem;
margin-left: 1rem;
}
.admin-title-badge, .admin-title { .admin-title-badge, .admin-title {
user-select: none; user-select: none;
margin-left: 1rem; }
.admin-title-badge:last-child {
margin-right: -0.1875rem;
} }
.admin-title { .admin-title {
@ -414,19 +426,12 @@
} }
} }
.admin-title-badge {
margin-right: -0.1875rem;
}
.sender-boosts { .sender-boosts {
user-select: none; user-select: none;
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: -0.125rem;
margin-inline-start: 0.125rem;
font-size: 0.75rem; font-size: 0.75rem;
} }
} }