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

Stop using absolute property to place beta pill on RoomPreviewCard #8872

Merged
merged 1 commit into from
Jun 19, 2022
Merged

Stop using absolute property to place beta pill on RoomPreviewCard #8872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions res/css/views/rooms/_RoomPreviewCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ limitations under the License.
color: $secondary-content;
}
}

// XXX Remove this when video rooms leave beta
.mx_BetaCard_betaPill {
align-self: start;
}
}

.mx_RoomPreviewCard_avatar {
Expand Down Expand Up @@ -105,13 +110,6 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/call/video-call.svg');
}
}

// XXX Remove this when video rooms leave beta
.mx_BetaCard_betaPill {
position: absolute;
right: $spacing-24;
top: $spacing-32;
}
}

h1.mx_RoomPreviewCard_name {
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/rooms/RoomPreviewCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
{ inviteSender }
</div> : null }
</div>
<BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} />
</div>;
}

Expand Down Expand Up @@ -152,7 +153,6 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
avatarRow = <>
<RoomAvatar room={room} height={50} width={50} viewAvatarOnClick />
<div className="mx_RoomPreviewCard_video" />
<BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} />
</>;
} else if (room.isSpaceRoom()) {
avatarRow = <RoomAvatar room={room} height={80} width={80} viewAvatarOnClick />;
Expand Down