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

Commit 1774aee

Browse files
committed
Make element web integration tests happy
1 parent 4713d0a commit 1774aee

File tree

3 files changed

+28
-30
lines changed

3 files changed

+28
-30
lines changed

res/css/structures/_MatrixChat.scss

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,10 @@ limitations under the License.
1717
.mx_MatrixChat_splash {
1818
position: relative;
1919
height: 100%;
20-
}
21-
22-
.mx_MatrixChat_splashButtons {
23-
text-align: center;
24-
width: 100%;
25-
position: absolute;
26-
bottom: 30px;
27-
}
2820

29-
.mx_MatrixChat_splashBackdrop {
30-
position: relative;
3121
&::before {
3222
/* Once we drop support for Firefox 102, remove this entire pseudo-element, move the background to the
33-
.mx_MatrixChat_splashBackdrop, and use backdrop-filter for the blur instead. */
23+
.mx_MatrixChat_splash, and use backdrop-filter for the blur instead. */
3424
content: "";
3525
display: block;
3626
position: absolute;
@@ -41,28 +31,28 @@ limitations under the License.
4131
gamma-incorrect gradient blending in browsers */
4232
background-image:
4333
radial-gradient(
44-
53.85% 66.75% at 87.55% 0%,
45-
hsla(250, 76%, 71%, 0.261) 0%,
46-
hsla(251, 83%, 79%, 0.1305) 50%,
47-
hsla(250, 100%, 88%, 0) 100%
34+
53.85% 66.75% at 87.55% 0%,
35+
hsla(250, 76%, 71%, 0.261) 0%,
36+
hsla(251, 83%, 79%, 0.1305) 50%,
37+
hsla(250, 100%, 88%, 0) 100%
4838
),
4939
radial-gradient(
50-
41.93% 41.93% at 0% 0%,
51-
hsla(222, 29%, 20%, 0.28) 0%,
52-
hsla(240, 17%, 53%, 0.14) 50%,
53-
hsla(250, 100%, 88%, 0) 100%
40+
41.93% 41.93% at 0% 0%,
41+
hsla(222, 29%, 20%, 0.28) 0%,
42+
hsla(240, 17%, 53%, 0.14) 50%,
43+
hsla(250, 100%, 88%, 0) 100%
5444
),
5545
radial-gradient(
56-
100% 100% at 0% 0%,
57-
hsla(250, 100%, 88%, 0.2436) 0%,
58-
hsla(318, 50%, 82%, 0.1218) 50%,
59-
hsla(0, 100%, 86%, 0) 100%
46+
100% 100% at 0% 0%,
47+
hsla(250, 100%, 88%, 0.2436) 0%,
48+
hsla(318, 50%, 82%, 0.1218) 50%,
49+
hsla(0, 100%, 86%, 0) 100%
6050
),
6151
radial-gradient(
62-
106.35% 96.26% at 100% 0%,
63-
hsla(250, 100%, 88%, 0.4) 0%,
64-
hsla(208, 67%, 85%, 0.2) 50%,
65-
hsla(167, 76%, 82%, 0) 100%
52+
106.35% 96.26% at 100% 0%,
53+
hsla(250, 100%, 88%, 0.4) 0%,
54+
hsla(208, 67%, 85%, 0.2) 50%,
55+
hsla(167, 76%, 82%, 0) 100%
6656
);
6757
/* Ugly hack to allow us to get rid of the color banding of the gradients */
6858
/* Can be replaced with backdrop-filter, replacing the hack below, after we stop supporting Firefox 102 */
@@ -72,6 +62,13 @@ limitations under the License.
7262
}
7363
}
7464

65+
.mx_MatrixChat_splashButtons {
66+
text-align: center;
67+
width: 100%;
68+
position: absolute;
69+
bottom: 30px;
70+
}
71+
7572
.mx_MatrixChat_wrapper {
7673
display: flex;
7774

src/components/structures/MatrixChat.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,6 +1236,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
12361236
this.screenAfterLogin.params,
12371237
);
12381238
this.screenAfterLogin = null;
1239+
MatrixClientPeg.userRegisteredWithinLastHours()
12391240
} else if (MatrixClientPeg.currentUserIsJustRegistered()) {
12401241
MatrixClientPeg.setJustRegisteredUserId(null);
12411242

@@ -1911,7 +1912,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
19111912

19121913
if (this.state.view === Views.LOADING) {
19131914
view = (
1914-
<div className="mx_MatrixChat_splash mx_MatrixChat_splashBackdrop">
1915+
<div className="mx_MatrixChat_splash">
19151916
<Spinner />
19161917
</div>
19171918
);
@@ -1961,7 +1962,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
19611962
</div>;
19621963
}
19631964
view = (
1964-
<div className="mx_MatrixChat_splash mx_MatrixChat_splashBackdrop">
1965+
<div className="mx_MatrixChat_splash">
19651966
{ errorBox }
19661967
<Spinner />
19671968
<div className="mx_MatrixChat_splashButtons">

src/components/views/dialogs/UseCaseSelection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ interface Props {
3333

3434
export default function UseCaseSelection({ onFinished }: Props) {
3535
return (
36-
<div className="mx_UseCaseSelection mx_MatrixChat_splashBackdrop">
36+
<div className="mx_UseCaseSelection mx_MatrixChat_splash">
3737
<div className="mx_UseCaseSelection_title mx_UseCaseSelection_fadeIn">
3838
<h1>{ _t("You’re in") }</h1>
3939
</div>

0 commit comments

Comments
 (0)