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

Remove obsolete style rules - mx_SpaceRoomView_inviteTeammates_betaDisclaimer #11004

Merged
merged 5 commits into from
May 29, 2023
Merged

Remove obsolete style rules - mx_SpaceRoomView_inviteTeammates_betaDisclaimer #11004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
462d10c
Remove obsolete style rules - mx_SpaceRoomView_inviteTeammates_betaDi…
luixxiul May 27, 2023
7a8d21f
Remove the deprecated disclaimer
luixxiul May 29, 2023
88b88a2
Merge branch 'develop' into SpaceRoomView
luixxiul May 29, 2023
c650eea
Remove ExternalLink
luixxiul May 29, 2023
da60c96
Add a Percy snapshot - 'Invite your teammates' dialog
luixxiul May 29, 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
2 changes: 2 additions & 0 deletions cypress/e2e/spaces/spaces.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ describe("Spaces", () => {
cy.findByPlaceholderText("Support").type("Projects");
cy.findByRole("button", { name: "Continue" }).click();

cy.get(".mx_SpaceRoomView").percySnapshotElement("Space - 'Invite your teammates' dialog");

cy.get(".mx_SpaceRoomView").within(() => {
cy.get("h1").findByText("Invite your teammates");
cy.findByRole("button", { name: "Skip for now" }).click();
Expand Down
17 changes: 0 additions & 17 deletions res/css/structures/_SpaceRoomView.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,23 +271,6 @@ $SpaceRoomViewInnerWidth: 428px;
}

.mx_SpaceRoomView_inviteTeammates {
/* XXX remove this when spaces leaves Beta */
.mx_SpaceRoomView_inviteTeammates_betaDisclaimer {
padding: 16px;
position: relative;
border-radius: 8px;
background-color: $header-panel-bg-color;
max-width: $SpaceRoomViewInnerWidth;
margin: 20px 0 30px;
box-sizing: border-box;

.mx_BetaCard_betaPill {
position: absolute;
left: 16px;
top: 16px;
}
}

.mx_SpaceRoomView_inviteTeammates_buttons {
color: $secondary-content;
margin-top: 28px;
Expand Down
17 changes: 0 additions & 17 deletions src/components/structures/SpaceRoomView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ import MainSplit from "./MainSplit";
import RightPanel from "./RightPanel";
import SpaceHierarchy, { showRoom } from "./SpaceHierarchy";
import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
import ExternalLink from "../views/elements/ExternalLink";

interface IProps {
space: Room;
Expand Down Expand Up @@ -586,22 +585,6 @@ const SpaceSetupPrivateInvite: React.FC<{
{_t("Make sure the right people have access. You can invite more later.")}
</div>

<div className="mx_SpaceRoomView_inviteTeammates_betaDisclaimer">
{_t(
"<b>This is an experimental feature.</b> For now, " +
"new users receiving an invite will have to open the invite on <link/> to actually join.",
{},
{
b: (sub) => <b>{sub}</b>,
link: () => (
<ExternalLink href="https://app.element.io/" rel="noreferrer noopener" target="_blank">
app.element.io
</ExternalLink>
),
},
)}
</div>

{error && <div className="mx_SpaceRoomView_errorText">{error}</div>}
<form onSubmit={onClick} id="mx_SpaceSetupPrivateInvite">
{fields}
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3479,7 +3479,6 @@
"Inviting…": "Inviting…",
"Invite your teammates": "Invite your teammates",
"Make sure the right people have access. You can invite more later.": "Make sure the right people have access. You can invite more later.",
"<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.": "<b>This is an experimental feature.</b> For now, new users receiving an invite will have to open the invite on <link/> to actually join.",
"Invite by username": "Invite by username",
"What are some things you want to discuss in %(spaceName)s?": "What are some things you want to discuss in %(spaceName)s?",
"Let's create a room for each of them.": "Let's create a room for each of them.",
Expand Down