Skip to content

Commit a115954

Browse files
t3chguyt3chguy
authored
Merge pull request matrix-org#5426 from matrix-org/t3chguy/socials
Social Login and login delight tweaks
2 parents 2574ba1 + 8593845 commit a115954

40 files changed

+1145
-1512
lines changed

‎res/css/_components.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
@import "./views/auth/_InteractiveAuthEntryComponents.scss";
4646
@import "./views/auth/_LanguageSelector.scss";
4747
@import "./views/auth/_PassphraseField.scss";
48-
@import "./views/auth/_ServerConfig.scss";
49-
@import "./views/auth/_ServerTypeSelector.scss";
5048
@import "./views/auth/_Welcome.scss";
5149
@import "./views/avatars/_BaseAvatar.scss";
5250
@import "./views/avatars/_DecoratedRoomAvatar.scss";
@@ -78,11 +76,13 @@
7876
@import "./views/dialogs/_MessageEditHistoryDialog.scss";
7977
@import "./views/dialogs/_ModalWidgetDialog.scss";
8078
@import "./views/dialogs/_NewSessionReviewDialog.scss";
79+
@import "./views/dialogs/_RegistrationEmailPromptDialog.scss";
8180
@import "./views/dialogs/_RoomSettingsDialog.scss";
8281
@import "./views/dialogs/_RoomSettingsDialogBridges.scss";
8382
@import "./views/dialogs/_RoomUpgradeDialog.scss";
8483
@import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
8584
@import "./views/dialogs/_ServerOfflineDialog.scss";
85+
@import "./views/dialogs/_ServerPickerDialog.scss";
8686
@import "./views/dialogs/_SetEmailDialog.scss";
8787
@import "./views/dialogs/_SettingsDialog.scss";
8888
@import "./views/dialogs/_ShareDialog.scss";
@@ -124,6 +124,8 @@
124124
@import "./views/elements/_RichText.scss";
125125
@import "./views/elements/_RoleButton.scss";
126126
@import "./views/elements/_RoomAliasField.scss";
127+
@import "./views/elements/_SSOButtons.scss";
128+
@import "./views/elements/_ServerPicker.scss";
127129
@import "./views/elements/_Slider.scss";
128130
@import "./views/elements/_Spinner.scss";
129131
@import "./views/elements/_StyledCheckbox.scss";

‎res/css/structures/auth/_Login.scss

+3-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
.mx_Login_submit {
1919
@mixin mx_DialogButton;
2020
width: 100%;
21-
margin-top: 35px;
21+
margin-top: 24px;
2222
margin-bottom: 24px;
2323
box-sizing: border-box;
2424
text-align: center;
@@ -33,12 +33,6 @@ limitations under the License.
3333
cursor: default;
3434
}
3535

36-
.mx_AuthBody a.mx_Login_sso_link:link,
37-
.mx_AuthBody a.mx_Login_sso_link:hover,
38-
.mx_AuthBody a.mx_Login_sso_link:visited {
39-
color: $button-primary-fg-color;
40-
}
41-
4236
.mx_Login_loader {
4337
display: inline;
4438
position: relative;
@@ -91,6 +85,8 @@ limitations under the License.
9185
}
9286

9387
div.mx_AccessibleButton_kind_link.mx_Login_forgot {
88+
display: block;
89+
margin: 0 auto;
9490
// style it as a link
9591
font-size: inherit;
9692
padding: 0;

‎res/css/views/auth/_AuthBody.scss

+12-6
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ limitations under the License.
3737
color: $authpage-primary-color;
3838
}
3939

40+
h3.mx_AuthBody_centered {
41+
text-align: center;
42+
}
43+
4044
a:link,
4145
a:hover,
4246
a:visited {
@@ -96,12 +100,6 @@ limitations under the License.
96100
}
97101
}
98102

99-
.mx_AuthBody_editServerDetails {
100-
padding-left: 1em;
101-
font-size: $font-12px;
102-
font-weight: normal;
103-
}
104-
105103
.mx_AuthBody_fieldRow {
106104
display: flex;
107105
margin-bottom: 10px;
@@ -146,6 +144,14 @@ limitations under the License.
146144
display: block;
147145
text-align: center;
148146
width: 100%;
147+
148+
> a {
149+
font-weight: $font-semi-bold;
150+
}
151+
}
152+
153+
.mx_SSOButtons + .mx_AuthBody_changeFlow {
154+
margin-top: 24px;
149155
}
150156

151157
.mx_AuthBody_spinner {

‎res/css/views/auth/_ServerTypeSelector.scss

-69
This file was deleted.

‎res/css/views/auth/_ServerConfig.scss renamed to ‎res/css/views/dialogs/_RegistrationEmailPromptDialog.scss

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright 2015, 2016 OpenMarket Ltd
3-
Copyright 2019 The Matrix.org Foundation C.I.C.
2+
Copyright 2020 The Matrix.org Foundation C.I.C.
43
54
Licensed under the Apache License, Version 2.0 (the "License");
65
you may not use this file except in compliance with the License.
@@ -15,21 +14,15 @@ See the License for the specific language governing permissions and
1514
limitations under the License.
1615
*/
1716

18-
.mx_ServerConfig_help:link {
19-
opacity: 0.8;
20-
}
21-
22-
.mx_ServerConfig_error {
23-
display: block;
24-
color: $warning-color;
25-
}
17+
.mx_RegistrationEmailPromptDialog {
18+
width: 417px;
2619

27-
.mx_ServerConfig_identityServer {
28-
transform: scaleY(0);
29-
transform-origin: top;
30-
transition: transform 0.25s;
20+
.mx_Dialog_content {
21+
margin-bottom: 24px;
22+
color: $tertiary-fg-color;
23+
}
3124

32-
&.mx_ServerConfig_identityServer_shown {
33-
transform: scaleY(1);
25+
.mx_Dialog_primary {
26+
width: 100%;
3427
}
3528
}

‎res/css/views/dialogs/_ServerPickerDialog.scss

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/*
2+
Copyright 2020 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
.mx_ServerPickerDialog {
18+
width: 468px;
19+
box-sizing: border-box;
20+
21+
.mx_Dialog_content {
22+
margin-bottom: 0;
23+
24+
> p {
25+
color: $secondary-fg-color;
26+
font-size: $font-14px;
27+
margin: 16px 0;
28+
29+
&:first-of-type {
30+
margin-bottom: 40px;
31+
}
32+
33+
&:last-of-type {
34+
margin: 0 24px 24px;
35+
}
36+
}
37+
38+
> h4 {
39+
font-size: $font-15px;
40+
font-weight: $font-semi-bold;
41+
color: $secondary-fg-color;
42+
margin-left: 8px;
43+
}
44+
45+
> a {
46+
color: $accent-color;
47+
margin-left: 8px;
48+
}
49+
}
50+
51+
.mx_ServerPickerDialog_otherHomeserverRadio {
52+
input[type="radio"] + div {
53+
margin-top: auto;
54+
margin-bottom: auto;
55+
}
56+
}
57+
58+
.mx_ServerPickerDialog_otherHomeserver {
59+
border-top: none;
60+
border-left: none;
61+
border-right: none;
62+
border-radius: unset;
63+
64+
> input {
65+
padding-left: 0;
66+
}
67+
68+
> label {
69+
margin-left: 0;
70+
}
71+
}
72+
73+
.mx_AccessibleButton_kind_primary {
74+
width: calc(100% - 64px);
75+
margin: 0 8px;
76+
padding: 15px 18px;
77+
}
78+
}

‎res/css/views/elements/_SSOButtons.scss

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
Copyright 2020 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
.mx_SSOButtons {
18+
display: flex;
19+
justify-content: center;
20+
21+
.mx_SSOButton {
22+
position: relative;
23+
width: 100%;
24+
padding-left: 32px;
25+
padding-right: 32px;
26+
27+
> img {
28+
object-fit: contain;
29+
position: absolute;
30+
left: 8px;
31+
top: 4px;
32+
}
33+
}
34+
35+
.mx_SSOButton_mini {
36+
box-sizing: border-box;
37+
width: 50px; // 48px + 1px border on all sides
38+
height: 50px; // 48px + 1px border on all sides
39+
40+
> img {
41+
left: 12px;
42+
top: 12px;
43+
}
44+
45+
& + .mx_SSOButton_mini {
46+
margin-left: 24px;
47+
}
48+
}
49+
}

0 commit comments

Comments
 (0)