matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into 'next'

Browse Source 
next

See merge request soapbox-pub/soapbox-fe!1250
This commit is contained in:
Alex Gleason
2022-04-22 21:12:22 +00:00
parent 0a1cc033af 8f848877a0
commit 942027bbd9
15 changed files with 162 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/soapbox/features/onboarding/onboarding-wizard.tsx
View File

@@ -68,13 +68,13 @@ const OnboardingWizard = () => {
return (
<div data-testid='onboarding-wizard'>
<div className='fixed h-screen w-full bg-gradient-to-tr from-primary-50 via-white to-cyan-50' />
<div className='fixed h-screen w-full bg-gradient-to-tr from-primary-50 dark:from-slate-700 via-white dark:via-slate-900 to-cyan-50 dark:to-cyan-900' />
<main className='h-screen flex flex-col'>
<main className='h-screen flex flex-col overflow-x-hidden'>
<div className='flex flex-col justify-center items-center h-full'>
<ReactSwipeableViews animateHeight index={currentStep} onChangeIndex={handleSwipe}>
{steps.map((step, i) => (
<div key={i} className='py-6 sm:mx-auto w-full sm:max-w-lg md:max-w-2xl'>
<div key={i} className='py-6 sm:mx-auto w-full max-w-[100vw] sm:max-w-lg md:max-w-2xl'>
<div
className={classNames({
'transition-opacity ease-linear': true,

2
app/soapbox/features/onboarding/steps/avatar-selection-step.tsx
View File

@@ -114,7 +114,7 @@ const AvatarSelectionStep = ({ onNext }: { onNext: () => void }) => {
<Stack justifyContent='center' space={2}>
<Button block theme='primary' type='button' onClick={onNext} disabled={isDefault && isDisabled || isSubmitting}>
{isSubmitting ? (
<FormattedMessage id='onboarding.saving' defaultMessage='Saving...' />
<FormattedMessage id='onboarding.saving' defaultMessage='Saving…' />
) : (
<FormattedMessage id='onboarding.next' defaultMessage='Next' />
)}

4
app/soapbox/features/onboarding/steps/bio-step.tsx
View File

@@ -65,7 +65,7 @@ const BioStep = ({ onNext }: { onNext: () => void }) => {
>
<Textarea
onChange={(event) => setValue(event.target.value)}
placeholder='Tell the world a little about yourself...'
placeholder='Tell the world a little about yourself…'
value={value}
maxLength={500}
/>
@@ -82,7 +82,7 @@ const BioStep = ({ onNext }: { onNext: () => void }) => {
onClick={handleSubmit}
>
{isSubmitting ? (
<FormattedMessage id='onboarding.saving' defaultMessage='Saving...' />
<FormattedMessage id='onboarding.saving' defaultMessage='Saving…' />
) : (
<FormattedMessage id='onboarding.next' defaultMessage='Next' />
)}

2
app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx
View File

@@ -135,7 +135,7 @@ const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
<Stack justifyContent='center' space={2}>
<Button block theme='primary' type='button' onClick={onNext} disabled={isDefault && isDisabled || isSubmitting}>
{isSubmitting ? 'Saving...' : 'Next'}
{isSubmitting ? 'Saving…' : 'Next'}
</Button>
{isDisabled && (

2
app/soapbox/features/onboarding/steps/display-name-step.tsx
View File

@@ -87,7 +87,7 @@ const DisplayNameStep = ({ onNext }: { onNext: () => void }) => {
disabled={isDisabled || isSubmitting}
onClick={handleSubmit}
>
{isSubmitting ? 'Saving...' : 'Next'}
{isSubmitting ? 'Saving…' : 'Next'}
</Button>
<Button block theme='link' type='button' onClick={onNext}>