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

Fixes a broken link and set margin around links on authentication dialog #8208

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f442200
Fixes a broken link and set margin around links
luixxiul Mar 31, 2022
dbdf83d
Wrap an inlined AccessibleButton with div
luixxiul Apr 1, 2022
9425477
Add the prefix first
luixxiul Apr 1, 2022
42874a9
Create _CaptchaForm.scss
luixxiul Apr 1, 2022
ca411f7
mx_AuthBody_changeFlow_signIn
luixxiul Apr 1, 2022
69bfbb7
Remove mx_AuthBody_link_signIn
luixxiul Apr 1, 2022
8886568
Merge branch 'develop' into Captcha
luixxiul Apr 6, 2022
51051e8
Merge branch 'develop' into Captcha
luixxiul Apr 7, 2022
854a121
Merge branch 'develop' into Captcha
luixxiul Apr 8, 2022
fee268b
Merge branch 'develop' into Captcha
luixxiul Apr 9, 2022
3c18ffe
Merge branch 'develop' into Captcha
luixxiul Apr 13, 2022
53eb605
Merge branch 'develop' into Captcha
luixxiul Apr 14, 2022
c9e25a9
Merge branch 'develop' into Captcha
luixxiul Apr 26, 2022
b7151e5
Use a variable
luixxiul May 12, 2022
feb3e48
Merge branch 'develop' into Captcha
luixxiul May 12, 2022
9fe38a8
Merge branch 'develop' into Captcha
luixxiul May 16, 2022
78d126b
Merge branch 'develop' into Captcha
luixxiul May 17, 2022
ee612e6
Merge branch 'develop' into Captcha
luixxiul May 18, 2022
30cdee0
Merge branch 'develop' into Captcha
luixxiul May 19, 2022
f7e3677
Merge branch 'develop' into Captcha
luixxiul May 20, 2022
92525ed
Merge branch 'develop' into Captcha
luixxiul May 21, 2022
4710bf6
Merge branch 'develop' into Captcha
luixxiul May 23, 2022
e544bb0
Merge branch 'develop' into Captcha
luixxiul May 24, 2022
38b7d58
Merge branch 'develop' into Captcha
luixxiul May 26, 2022
f74a7d4
Merge branch 'develop' into Captcha
luixxiul May 26, 2022
5ebe355
Merge branch 'develop' into Captcha
luixxiul May 29, 2022
f6a8864
Merge branch 'develop' into Captcha
luixxiul May 30, 2022
d301634
Merge branch 'develop' into Captcha
luixxiul Jun 1, 2022
c24adb4
Merge branch 'develop' into Captcha
luixxiul Jun 2, 2022
3282eec
Merge branch 'develop' into Captcha
luixxiul Jun 5, 2022
1cd9ecc
Merge branch 'develop' into Captcha
luixxiul Jun 6, 2022
4d466e2
Merge branch 'develop' into Captcha
luixxiul Jun 7, 2022
c329107
Merge branch 'develop' into Captcha
luixxiul Jun 8, 2022
1a08e52
Merge branch 'develop' into Captcha
luixxiul Jun 9, 2022
3a986d1
Merge branch 'develop' into Captcha
luixxiul Jun 11, 2022
f18db65
Merge branch 'develop' into Captcha
luixxiul Jun 15, 2022
123ffc8
Merge branch 'develop' into Captcha
luixxiul Jun 16, 2022
ac783d7
Merge branch 'develop' into Captcha
luixxiul Jun 16, 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/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
@import "./views/auth/_AuthHeader.scss";
@import "./views/auth/_AuthHeaderLogo.scss";
@import "./views/auth/_AuthPage.scss";
@import "./views/auth/_CaptchaForm.scss";
@import "./views/auth/_CompleteSecurityBody.scss";
@import "./views/auth/_CountryDropdown.scss";
@import "./views/auth/_InteractiveAuthEntryComponents.scss";
Expand Down
4 changes: 4 additions & 0 deletions res/css/views/auth/_AuthBody.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ limitations under the License.
> a {
font-weight: $font-semi-bold;
}

&.mx_AuthBody_changeFlow_signIn {
margin: 6px auto 0; // TODO: Use a spacing variable
}
}

.mx_SSOButtons + .mx_AuthBody_changeFlow {
Expand Down
22 changes: 22 additions & 0 deletions res/css/views/auth/_CaptchaForm.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
Copyright 2022 Suguru Hirahara <[email protected]>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_CaptchaForm_recaptchaContainer {
.mx_CaptchaForm_recaptchaContainer_info,
.mx_CaptchaForm_recaptchaContainer_error {
margin: $spacing-12 auto;
}
}
17 changes: 9 additions & 8 deletions src/components/structures/auth/Registration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ export default class Registration extends React.Component<IProps, IState> {
);
}

const signIn = <span className="mx_AuthBody_changeFlow">
const signIn = <span className="mx_AuthBody_changeFlow mx_AuthBody_changeFlow_signIn">
{ _t("Already have an account? <a>Sign in here</a>", {}, {
a: sub => <AccessibleButton kind='link_inline' onClick={this.onLoginClick}>{ sub }</AccessibleButton>,
}) }
Expand All @@ -579,13 +579,14 @@ export default class Registration extends React.Component<IProps, IState> {
// Only show the 'go back' button if you're not looking at the form
let goBack;
if (this.state.doingUIAuth) {
goBack = <AccessibleButton
kind='link_inline'
className="mx_AuthBody_changeFlow"
onClick={this.onGoToFormClicked}
>
{ _t('Go back') }
</AccessibleButton>;
goBack = <div className="mx_AuthBody_changeFlow">
<AccessibleButton
kind='link_inline'
onClick={this.onGoToFormClicked}
>
{ _t('Go back') }
</AccessibleButton>
</div>;
}

let body;
Expand Down
13 changes: 8 additions & 5 deletions src/components/views/auth/CaptchaForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,22 @@ export default class CaptchaForm extends React.Component<ICaptchaFormProps, ICap
let error = null;
if (this.state.errorText) {
error = (
<div className="error">
<div className="error" role="alert">
{ this.state.errorText }
</div>
);
}

return (
<div ref={this.recaptchaContainer}>
<p>{ _t(
<div className="mx_CaptchaForm_recaptchaContainer" ref={this.recaptchaContainer}>
<p className="mx_CaptchaForm_recaptchaContainer_info">{ _t(
"This homeserver would like to make sure you are not a robot.",
) }</p>
<div id={DIV_ID} />
{ error }
<div
className="mx_CaptchaForm_recaptchaContainer_recaptcha"
id={DIV_ID}
/>
<div className="mx_CaptchaForm_recaptchaContainer_error">{ error }</div>
</div>
);
}
Expand Down