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

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

pull/28217/head
Suguru Hirahara 2022-06-19 12:35:04 +00:00 committed by GitHub
parent b1e07e8ef0
commit cfbe1cb066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/css/views/rooms/_RoomPreviewCard.scss
View File

@ -71,6 +71,11 @@ limitations under the License.
color: $secondary-content; color: $secondary-content;
} }
} }
// XXX Remove this when video rooms leave beta
.mx_BetaCard_betaPill {
align-self: start;
}
} }
.mx_RoomPreviewCard_avatar { .mx_RoomPreviewCard_avatar {
@ -105,13 +110,6 @@ limitations under the License.
mask-image: url('$(res)/img/element-icons/call/video-call.svg'); 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 { h1.mx_RoomPreviewCard_name {

2
src/components/views/rooms/RoomPreviewCard.tsx
View File

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