Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(onboarding-ui): Fix font scales, translations, text colors #1208

Merged
merged 8 commits into from
Nov 17, 2023
Merged

fix(onboarding-ui): Fix font scales, translations, text colors #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d68ea2f
fix design
tiagoevanp Oct 24, 2023
b3ec093
title
tiagoevanp Oct 24, 2023
e557fad
qa review
tiagoevanp Oct 31, 2023
ca25ea8
Merge branch 'main' into chore/onboarding-ui-adjustments
tiagoevanp Oct 31, 2023
53601a8
offline button
tiagoevanp Nov 16, 2023
75eca00
Merge branch 'main' into chore/onboarding-ui-adjustments
tiagoevanp Nov 16, 2023
90ef6e3
Create mighty-chicken-sip.md
tiagoevanp Nov 16, 2023
2ced2e9
Merge branch 'main' into chore/onboarding-ui-adjustments
tiagoevanp Nov 17, 2023
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
6 changes: 6 additions & 0 deletions .changeset/mighty-chicken-sip.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/layout": patch
"@rocket.chat/onboarding-ui": patch
---

Adjust some font scales and text colors, fix some wrong translations, remove description from admin email on register server step, disable register workspace button when air-gapped.
2 changes: 1 addition & 1 deletion packages/layout/src/FormPageLayout/FormSteps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const FormSteps = ({
const { t } = useTranslation();

return (
<Box mbe={8} fontScale='c2' color='neutral-600'>
<Box mbe={8} fontScale='c2' color='font-secondary-info'>
{t('component.form.steps', { currentStep, stepCount })}
</Box>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/src/FormPageLayout/FormTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const FormTitle = forwardRef<
children: ReactNode;
}
>((props, ref) => (
<Box mbe={8} fontScale='h2' fontWeight={800} {...props} ref={ref} />
<Box mbe={8} fontScale='h3' fontWeight={800} {...props} ref={ref} />
));

export default FormTitle;
2 changes: 1 addition & 1 deletion packages/onboarding-ui/.i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"title": "Awaiting confirmation",
"content": {
"securityCode": "Security code",
"sentEmail": "Email sent to <1>{{email}}</1> with a confirmation link.Please verify that the security code below matches the one in the email."
"sentEmail": "Email sent to <1>{{emailAddress}}</1> with a confirmation link.Please verify that the security code below matches the one in the email."
}
},
"loginForm": {
Expand Down
2 changes: 1 addition & 1 deletion packages/onboarding-ui/src/common/EmailCodeFallback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const EmailCodeFallback = ({
onResendEmailRequest,
onChangeEmailRequest,
}: EmailCodeFallbackProps): ReactElement => (
<Box fontScale='c1'>
<Box fontScale='p2'>
<Trans i18nKey='component.emailCodeFallback'>
Didn’t receive email?
<ActionLink onClick={onResendEmailRequest}>Resend</ActionLink>
Expand Down
2 changes: 1 addition & 1 deletion packages/onboarding-ui/src/forms/AwaitConfirmationForm/AwaitConfirmationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const AwaitingConfirmationForm = ({
<Form.Title>{t('form.awaitConfirmationForm.title')}</Form.Title>
</Form.Header>
<Form.Container>
<Box fontScale='c1' mbe={24}>
<Box fontScale='p2' mbe={24}>
<Trans i18nKey='form.awaitConfirmationForm.content.sentEmail'>
Email sent to <strong>{{ emailAddress }}</strong> with a
confirmation link.Please verify that the security code below matches
Expand Down
11 changes: 1 addition & 10 deletions packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
Field,
EmailInput,
CheckBox,
Icon,
FieldLabel,
FieldRow,
FieldError,
Expand Down Expand Up @@ -107,14 +106,6 @@ const RegisterServerForm = ({
htmlFor={emailField}
>
{t('form.registeredServerForm.fields.accountEmail.inputLabel')}
<Icon
title={t(
'form.registeredServerForm.fields.accountEmail.tooltipLabel'
)}
mis={4}
size='x16'
name='info'
/>
</FieldLabel>
<FieldRow>
<Controller
Expand Down Expand Up @@ -212,7 +203,7 @@ const RegisterServerForm = ({
<Button
type='submit'
primary
disabled={isSubmitting || isValidating}
disabled={isSubmitting || isValidating || offline}
>
{t('component.form.action.registerWorkspace')}
</Button>
Expand Down
Loading