OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix: Emoji cause topics being cut off in new room header (#11865) 

* Order of buttons on the right should be Video Call, Voice Call, Threads, Facepile

* Fix 26326: Emoji cause topics being cut off in new room header
t3chguy/dedup-icons-17oct
Kerry 2023-11-15 11:20:21 +13:00 committed by GitHub
parent eca08db05a
commit f6ef476f79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/views/rooms/_RoomHeader.pcss
View File

@ -55,6 +55,11 @@ limitations under the License.
height: 0;
opacity: 0;
transition: all var(--transition-standard) ease 0.1s;
/* Emojis are rendered a bit bigger than text in the timeline
Make them compact/the same size as text here */
.mx_Emoji {
font-size: inherit;
}
}
.mx_RoomHeader:hover .mx_RoomHeader_topic {

19
src/components/views/rooms/RoomHeader.tsx
View File

@ -193,6 +193,15 @@ export default function RoomHeader({
</Tooltip>
);
})}
<Tooltip label={!videoCallDisabledReason ? _t("voip|video_call") : videoCallDisabledReason!}>
<IconButton
disabled={!!videoCallDisabledReason}
aria-label={!videoCallDisabledReason ? _t("voip|video_call") : videoCallDisabledReason!}
onClick={videoCallClick}
>
<VideoCallIcon />
</IconButton>
</Tooltip>
{!useElementCallExclusively && (
<Tooltip label={!voiceCallDisabledReason ? _t("voip|voice_call") : voiceCallDisabledReason!}>
<IconButton
@ -204,15 +213,7 @@ export default function RoomHeader({
</IconButton>
</Tooltip>
)}
<Tooltip label={!videoCallDisabledReason ? _t("voip|video_call") : videoCallDisabledReason!}>
<IconButton
disabled={!!videoCallDisabledReason}
aria-label={!videoCallDisabledReason ? _t("voip|video_call") : videoCallDisabledReason!}
onClick={videoCallClick}
>
<VideoCallIcon />
</IconButton>
</Tooltip>
<Tooltip label={_t("common|threads")}>
<IconButton
indicator={notificationColorToIndicator(threadNotifications)}