Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move the beta pill to the right side and display the pill on video room only #8873

Merged
merged 2 commits into from
Jun 19, 2022
Merged

Move the beta pill to the right side and display the pill on video room only #8873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b19c4e8
Move the beta pill to the right side
luixxiul Jun 19, 2022
9286553
Display pill on video room only
luixxiul Jun 19, 2022
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
1 change: 1 addition & 0 deletions res/css/views/rooms/_RoomPreviewCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ limitations under the License.

// XXX Remove this when video rooms leave beta
.mx_BetaCard_betaPill {
margin-inline-start: auto;
align-self: start;
}
}
Expand Down
5 changes: 4 additions & 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,7 +102,10 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
{ inviteSender }
</div> : null }
</div>
<BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} />
{ room.isElementVideoRoom()
? <BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} />
: null
}
</div>;
}

Expand Down