Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

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

Merged
merged 4 commits into from
Nov 14, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a615db1
Order of buttons on the right should be Video Call, Voice Call, Threa…
Nov 13, 2023
6a3470e
Fix 26326: Emoji cause topics being cut off in new room header
Nov 13, 2023
57ca6ac
Merge branch 'develop' into kerry/26569/room-header-buttons
Nov 14, 2023
cf5d2d1
Merge branch 'develop' into kerry/26569/room-header-buttons
Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions res/css/views/rooms/_RoomHeader.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
19 changes: 10 additions & 9 deletions src/components/views/rooms/RoomHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)}
Expand Down
Loading