Skip to content

Commit 1adf38e

Browse files
committed
Merge branch 'develop' into call-toasts
2 parents cf4332a + c02b970 commit 1adf38e

75 files changed

Lines changed: 394 additions & 394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/web/src/async-components/structures/ErrorView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ export const UnsupportedBrowserView: React.FC<{
192192
</Text>
193193

194194
<Flex gap="var(--cpd-space-4x)" className="mx_ErrorView_flexContainer mx_ErrorView_buttons">
195-
<Button Icon={PopOutIcon} kind="secondary" size="sm">
195+
<Button Icon={PopOutIcon} kind="secondary" size="md">
196196
{_t("incompatible_browser|learn_more")}
197197
</Button>
198198
{onAccept && (
199-
<Button kind="primary" size="sm" onClick={onAccept}>
199+
<Button kind="primary" size="md" onClick={onAccept}>
200200
{_t("incompatible_browser|continue")}
201201
</Button>
202202
)}

apps/web/src/components/structures/auth/ForgotPassword.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ export default class ForgotPassword extends React.Component<Props, State> {
419419
</StyledCheckbox>
420420
</div>
421421
{this.state.errorText && <ErrorMessage message={this.state.errorText} />}
422-
<Button type="submit" className="mx_Login_submit" size="sm">
422+
<Button type="submit" className="mx_Login_submit" size="md">
423423
{submitButtonChild}
424424
</Button>
425425
</fieldset>
@@ -434,7 +434,7 @@ export default class ForgotPassword extends React.Component<Props, State> {
434434
<CheckIcon className="mx_Icon mx_Icon_32 mx_Icon_accent" />
435435
<h1>{_t("auth|reset_password|reset_successful")}</h1>
436436
{this.state.logoutDevices ? <p>{_t("auth|reset_password|devices_logout_success")}</p> : null}
437-
<Button className="mx_Login_submit" size="sm" type="button" onClick={this.props.onComplete}>
437+
<Button className="mx_Login_submit" size="md" type="button" onClick={this.props.onComplete}>
438438
{_t("auth|reset_password|return_to_login")}
439439
</Button>
440440
</>

apps/web/src/components/structures/auth/Login.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ class LoginComponent extends React.PureComponent<IProps, IState> {
441441
<Button
442442
className="mx_Login_fullWidthButton"
443443
kind="primary"
444-
size="sm"
444+
size="md"
445445
onClick={async () => {
446446
await startOidcLogin(
447447
this.props.serverConfig.delegatedAuthentication!,

apps/web/src/components/structures/auth/Registration.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ export default class Registration extends React.Component<IProps, IState> {
550550
<Button
551551
className="mx_Login_fullWidthButton"
552552
kind="primary"
553-
size="sm"
553+
size="md"
554554
onClick={async () => {
555555
await startOidcLogin(
556556
this.props.serverConfig.delegatedAuthentication!,

apps/web/src/components/structures/auth/forgot-password/CheckEmail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const CheckEmail: React.FC<CheckEmailProps> = ({
5555
</div>
5656
</div>
5757
{errorText && <ErrorMessage message={errorText} />}
58-
<Button onClick={onSubmitForm} type="button" className="mx_Login_submit" size="sm">
58+
<Button onClick={onSubmitForm} type="button" className="mx_Login_submit" size="md">
5959
{_t("action|next")}
6060
</Button>
6161
<div className="mx_AuthBody_did-not-receive">

apps/web/src/components/structures/auth/forgot-password/EnterEmail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const EnterEmail: React.FC<EnterEmailProps> = ({
7575
/>
7676
</div>
7777
{errorText && <ErrorMessage message={errorText} />}
78-
<Button type="submit" className="mx_Login_submit" size="sm">
78+
<Button type="submit" className="mx_Login_submit" size="md">
7979
{submitButtonChild}
8080
</Button>
8181
<div className="mx_AuthBody_button-container">

apps/web/src/components/views/auth/DefaultWelcome.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ const DefaultWelcome: React.FC = () => {
3232
{isElement && <Text size="md">{_t("welcome|tagline_element")}</Text>}
3333

3434
<div className="mx_DefaultWelcome_buttons">
35-
<Button as="a" href="#/login" kind="primary" size="sm">
35+
<Button as="a" href="#/login" kind="primary" size="md">
3636
{_t("action|sign_in")}
3737
</Button>
38-
<Button as="a" href="#/register" kind="secondary" size="sm">
38+
<Button as="a" href="#/register" kind="secondary" size="md">
3939
{_t("action|create_account")}
4040
</Button>
4141
{showGuestFunctions && (
42-
<Button as="a" href="#/directory" kind="tertiary" size="sm">
42+
<Button as="a" href="#/directory" kind="tertiary" size="md">
4343
{_t("action|explore_rooms")}
4444
</Button>
4545
)}

apps/web/src/components/views/auth/PasswordLogin.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
434434
/>
435435
{forgotPasswordJsx}
436436
{!this.props.busy && (
437-
<Button className="mx_Login_submit" size="sm" type="submit" disabled={this.props.disableSubmit}>
437+
<Button className="mx_Login_submit" size="md" type="submit" disabled={this.props.disableSubmit}>
438438
{_t("action|sign_in")}
439439
</Button>
440440
)}

apps/web/src/components/views/auth/RegistrationForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
549549

550550
public render(): ReactNode {
551551
const registerButton = (
552-
<Button className="mx_Login_submit" size="sm" type="submit" disabled={!this.props.canSubmit}>
552+
<Button className="mx_Login_submit" size="md" type="submit" disabled={!this.props.canSubmit}>
553553
{_t("action|register")}
554554
</Button>
555555
);

apps/web/src/components/views/elements/BugReportDialogButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export function BugReportDialogButton({
3434
return null;
3535
}
3636
return (
37-
<Button kind="secondary" size="sm" onClick={onClick}>
37+
<Button kind="secondary" size="md" onClick={onClick}>
3838
{bugReportUrl === BugReportEndpointURLLocal
3939
? _t("bug_reporting|download_logs")
4040
: _t("bug_reporting|submit_debug_logs")}

0 commit comments

Comments
 (0)