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

Middle Header: Fix overflowing status text (#1664)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-01-25 03:24:29 +01:00
parent e3d857b466
commit b43cde120d
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/common/GroupChatInfo.tsx
View File

@ -102,7 +102,7 @@ const GroupChatInfo: FC<OwnProps & StateProps> = ({
if (withChatType) { if (withChatType) {
return ( return (
<div className="status" dir="auto">{lang(getChatTypeString(chat))}</div> <span className="status" dir="auto">{lang(getChatTypeString(chat))}</span>
); );
} }
@ -111,11 +111,11 @@ const GroupChatInfo: FC<OwnProps & StateProps> = ({
const onlineStatus = onlineCount ? `, ${lang('OnlineCount', onlineCount, 'i')}` : undefined; const onlineStatus = onlineCount ? `, ${lang('OnlineCount', onlineCount, 'i')}` : undefined;
return ( return (
<div className="status"> <span className="status">
{handle && <span className="handle">{handle}</span>} {handle && <span className="handle">{handle}</span>}
<span className="group-status">{groupStatus}</span> <span className="group-status">{groupStatus}</span>
{onlineStatus && <span className="online-status">{onlineStatus}</span>} {onlineStatus && <span className="online-status">{onlineStatus}</span>}
</div> </span>
); );
} }

4
src/components/common/PrivateChatInfo.tsx
View File

@ -110,10 +110,10 @@ const PrivateChatInfo: FC<OwnProps & StateProps> = ({
} }
return ( return (
<div className={`status ${isUserOnline(user, userStatus) ? 'online' : ''}`}> <span className={`status ${isUserOnline(user, userStatus) ? 'online' : ''}`}>
{withUsername && user.username && <span className="handle">{user.username}</span>} {withUsername && user.username && <span className="handle">{user.username}</span>}
<span className="user-status" dir="auto">{getUserStatus(lang, user, userStatus, serverTimeOffset)}</span> <span className="user-status" dir="auto">{getUserStatus(lang, user, userStatus, serverTimeOffset)}</span>
</div> </span>
); );
} }

10
src/components/middle/MiddleHeader.scss
View File

@ -282,9 +282,15 @@
} }
} }
.status { .status, .typing-status {
display: flex; display: inline;
unicode-bidi: plaintext; unicode-bidi: plaintext;
@media (min-width: 1275px) {
#Main.right-column-open & {
max-width: calc(100% - var(--right-column-width));
}
}
} }
.user-status { .user-status {