diff --git a/src/features/auth-login/components/otp-auth-form.tsx b/src/features/auth-login/components/otp-auth-form.tsx index 06423e5e6..a7b55d21d 100644 --- a/src/features/auth-login/components/otp-auth-form.tsx +++ b/src/features/auth-login/components/otp-auth-form.tsx @@ -3,6 +3,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl'; import { Redirect } from 'react-router-dom'; import { otpVerify, verifyCredentials, switchAccount } from 'soapbox/actions/auth'; +import { BigCard } from 'soapbox/components/big-card'; import { Button, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; @@ -47,41 +48,33 @@ const OtpAuthForm: React.FC = ({ mfa_token }) => { if (shouldRedirect) return ; return ( -
-
-

- -

-
+ }> +
+ + + -
- - + - - -
-
+ + + + + ); }; diff --git a/src/features/auth-login/components/password-reset-confirm.tsx b/src/features/auth-login/components/password-reset-confirm.tsx index 78ef26fd7..c079b418d 100644 --- a/src/features/auth-login/components/password-reset-confirm.tsx +++ b/src/features/auth-login/components/password-reset-confirm.tsx @@ -3,6 +3,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { Redirect } from 'react-router-dom'; import { resetPasswordConfirm } from 'soapbox/actions/security'; +import { BigCard } from 'soapbox/components/big-card'; import { Button, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; @@ -55,33 +56,25 @@ const PasswordResetConfirm = () => { } return ( -
-
-

- -

-
+ }> +
+ } errors={renderErrors()}> + + -
- - } errors={renderErrors()}> - - - - - - - -
-
+ + + + + ); }; diff --git a/src/features/auth-login/components/password-reset.tsx b/src/features/auth-login/components/password-reset.tsx index 6cc9109d3..11d1f42f0 100644 --- a/src/features/auth-login/components/password-reset.tsx +++ b/src/features/auth-login/components/password-reset.tsx @@ -3,6 +3,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { Redirect } from 'react-router-dom'; import { resetPassword } from 'soapbox/actions/security'; +import { BigCard } from 'soapbox/components/big-card'; import { Button, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui'; import { useAppDispatch, useFeatures } from 'soapbox/hooks'; import toast from 'soapbox/toast'; @@ -36,32 +37,24 @@ const PasswordReset = () => { if (success) return ; return ( -
-
-

- -

-
+ }> +
+ + + -
- - - - - - - - - -
-
+ + + + + ); }; diff --git a/src/features/auth-login/components/registration-page.tsx b/src/features/auth-login/components/registration-page.tsx index c58633fa6..7f1e81ce5 100644 --- a/src/features/auth-login/components/registration-page.tsx +++ b/src/features/auth-login/components/registration-page.tsx @@ -1,18 +1,15 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Card, CardTitle, Stack } from 'soapbox/components/ui'; +import { BigCard } from 'soapbox/components/big-card'; import RegistrationForm from './registration-form'; const RegistrationPage: React.FC = () => { return ( - - - } /> - - - + }> + + ); }; diff --git a/src/features/onboarding/steps/avatar-selection-step.tsx b/src/features/onboarding/steps/avatar-selection-step.tsx index 55a54c514..149d5e3e3 100644 --- a/src/features/onboarding/steps/avatar-selection-step.tsx +++ b/src/features/onboarding/steps/avatar-selection-step.tsx @@ -3,7 +3,8 @@ import React from 'react'; import { defineMessages, FormattedMessage } from 'react-intl'; import { patchMe } from 'soapbox/actions/me'; -import { Avatar, Button, Card, CardBody, Icon, Spinner, Stack, Text } from 'soapbox/components/ui'; +import { BigCard } from 'soapbox/components/big-card'; +import { Avatar, Button, Icon, Spinner, Stack } from 'soapbox/components/ui'; import { useAppDispatch, useOwnAccount } from 'soapbox/hooks'; import toast from 'soapbox/toast'; import { isDefaultAvatar } from 'soapbox/utils/accounts'; @@ -64,69 +65,54 @@ const AvatarSelectionStep = ({ onNext }: { onNext: () => void }) => { }; return ( - - -
-
- - - - + } + subtitle={} + > + +
+ {account && ( + + )} - - - - -
+ {isSubmitting && ( +
+ +
+ )} -
- -
- {account && ( - - )} + - {isSubmitting && ( -
- -
- )} - - - - -
- - - - - {isDisabled && ( - - )} - -
-
+
- - + + + + + {isDisabled && ( + + )} + + + ); }; diff --git a/src/features/onboarding/steps/bio-step.tsx b/src/features/onboarding/steps/bio-step.tsx index c0a029d80..6b2862bbb 100644 --- a/src/features/onboarding/steps/bio-step.tsx +++ b/src/features/onboarding/steps/bio-step.tsx @@ -2,7 +2,8 @@ import React from 'react'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { patchMe } from 'soapbox/actions/me'; -import { Button, Card, CardBody, FormGroup, Stack, Text, Textarea } from 'soapbox/components/ui'; +import { BigCard } from 'soapbox/components/big-card'; +import { Button, FormGroup, Stack, Textarea } from 'soapbox/components/ui'; import { useAppDispatch, useOwnAccount } from 'soapbox/hooks'; import toast from 'soapbox/toast'; @@ -43,62 +44,49 @@ const BioStep = ({ onNext }: { onNext: () => void }) => { }; return ( - - + } + subtitle={} + > +
-
- - - - + } + labelText={} + errors={errors} + > +