diff --git a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js index e7d2aa721e..510a280f4a 100644 --- a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js +++ b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js @@ -10,7 +10,6 @@ import { Link } from '@strapi/design-system/Link'; import { Box } from '@strapi/design-system/Box'; import { Stack } from '@strapi/design-system/Stack'; import { Flex } from '@strapi/design-system/Flex'; -import { H1 } from '@strapi/design-system/Text'; import { Typography } from '@strapi/design-system/Typography'; import { Content, IconBox, Overlay } from './Overlay'; @@ -48,7 +47,9 @@ const Blocker = ({ displayedIcon, description, title, isOpen }) => { -

{formatMessage(title)}

+ + {formatMessage(title)} +
diff --git a/packages/core/admin/admin/src/components/LeftMenu/index.js b/packages/core/admin/admin/src/components/LeftMenu/index.js index 1002745685..8d2109d621 100644 --- a/packages/core/admin/admin/src/components/LeftMenu/index.js +++ b/packages/core/admin/admin/src/components/LeftMenu/index.js @@ -15,7 +15,7 @@ import { } from '@strapi/design-system/MainNav'; import { FocusTrap } from '@strapi/design-system/FocusTrap'; import { Box } from '@strapi/design-system/Box'; -import { Text } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import { Stack } from '@strapi/design-system/Stack'; import Write from '@strapi/icons/Write'; import Exit from '@strapi/icons/Exit'; @@ -144,20 +144,20 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => { - + {formatMessage({ id: 'app.components.LeftMenu.profile', defaultMessage: 'Profile', })} - + - + {formatMessage({ id: 'app.components.LeftMenu.logout', defaultMessage: 'Logout', })} - +
diff --git a/packages/core/admin/admin/src/components/UpgradePlanModal /index.js b/packages/core/admin/admin/src/components/UpgradePlanModal /index.js index c388abdc70..df6dfd81da 100644 --- a/packages/core/admin/admin/src/components/UpgradePlanModal /index.js +++ b/packages/core/admin/admin/src/components/UpgradePlanModal /index.js @@ -8,7 +8,7 @@ import { IconButton } from '@strapi/design-system/IconButton'; import { LinkButton } from '@strapi/design-system/LinkButton'; import { Box } from '@strapi/design-system/Box'; import { Flex } from '@strapi/design-system/Flex'; -import { Text, H1 } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import { Stack } from '@strapi/design-system/Stack'; import ExternalLink from '@strapi/icons/ExternalLink'; import Cross from '@strapi/icons/Cross'; @@ -48,10 +48,6 @@ const UpgradeContainer = styled(Flex)` } `; -const TextBold = styled(Text)` - font-weight: 700; -`; - const StackFlexStart = styled(Stack)` align-items: flex-start; max-width: ${400 / 16}rem; @@ -82,26 +78,26 @@ const UpgradePlanModal = ({ onClose, isOpen }) => { } /> - + {formatMessage({ id: 'app.components.UpgradePlanModal.text-ce', defaultMessage: 'COMMUNITY EDITION', })} - + -

+ {formatMessage({ id: 'app.components.UpgradePlanModal.limit-reached', defaultMessage: 'You have reached the limit', })} -

- + + {formatMessage({ id: 'app.components.UpgradePlanModal.text-power', defaultMessage: 'Unlock the full power of Strapi by upgrading your plan to the Enterprise Edition', })} - +
}> {formatMessage({ diff --git a/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js b/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js index 3e410f73ca..8e9a18083c 100644 --- a/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js +++ b/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js @@ -4,7 +4,7 @@ import { useIntl } from 'react-intl'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faQuestion, faTimes } from '@fortawesome/free-solid-svg-icons'; import { Box } from '@strapi/design-system/Box'; -import { Text } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import { FocusTrap } from '@strapi/design-system/FocusTrap'; import { useConfigurations } from '../../../hooks'; @@ -52,12 +52,12 @@ const StyledLink = styled.a` color: ${({ theme }) => theme.colors.neutral700}; } - ${[Text]} { + ${[Typography]} { color: ${({ theme }) => theme.colors.neutral700}; } } - ${[Text]} { + ${[Typography]} { color: ${({ theme }) => theme.colors.neutral600}; } `; @@ -124,7 +124,7 @@ const Onboarding = () => { href={link.destination} > - {link.label} + {link.label} ))} diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js index 920972e208..caebdecf05 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js @@ -9,7 +9,7 @@ import { Flex } from '@strapi/design-system/Flex'; import { Link } from '@strapi/design-system/Link'; import { Button } from '@strapi/design-system/Button'; import { TextInput } from '@strapi/design-system/TextInput'; -import { H1, Text } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import { Formik } from 'formik'; import UnauthenticatedLayout, { Column, @@ -38,20 +38,25 @@ const ForgotPassword = ({ onSubmit, schema }) => { -

+ {formatMessage({ id: 'Auth.form.button.password-recovery', defaultMessage: 'Password Recovery', })} -

+
{errors.errorMessage && ( - + {formatMessage({ id: errors.errorMessage, defaultMessage: 'An error occurred', })} - + )}
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js index 424c7bbbb7..b99da40323 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js @@ -4,7 +4,7 @@ import { Box } from '@strapi/design-system/Box'; import { Main } from '@strapi/design-system/Main'; import { Flex } from '@strapi/design-system/Flex'; import { Link } from '@strapi/design-system/Link'; -import { H1, Text } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import UnauthenticatedLayout, { Column, LayoutContent, @@ -21,27 +21,27 @@ const ForgotPasswordSuccess = () => { -

+ {formatMessage({ id: 'app.containers.AuthPage.ForgotPasswordSuccess.title', defaultMessage: 'Email sent', })} -

+
- + {formatMessage({ id: 'app.containers.AuthPage.ForgotPasswordSuccess.text.email', defaultMessage: 'It can take a few minutes to receive your password recovery link.', })} - + - + {formatMessage({ id: 'app.containers.AuthPage.ForgotPasswordSuccess.text.contact-admin', defaultMessage: 'If you do not receive this link, please contact your administrator.', })} - +
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js index 27353c78fa..285d70d188 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js @@ -9,7 +9,7 @@ import { Link } from '@strapi/design-system/Link'; import { Button } from '@strapi/design-system/Button'; import { TextInput } from '@strapi/design-system/TextInput'; import { Checkbox } from '@strapi/design-system/Checkbox'; -import { H1, Text, Subtitle } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import { Form } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; @@ -48,25 +48,30 @@ const Login = ({ onSubmit, schema, children }) => { -

+ {formatMessage({ id: 'Auth.form.welcome.title', defaultMessage: 'Welcome!', })} -

+
- + {formatMessage({ id: 'Auth.form.welcome.subtitle', defaultMessage: 'Log in to your Strapi account', })} - + {errors.errorMessage && ( - + {errors.errorMessage} - + )}
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js index 58a3dbb864..b86cf2f88c 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js @@ -5,7 +5,7 @@ import { Box } from '@strapi/design-system/Box'; import { Main } from '@strapi/design-system/Main'; import { Flex } from '@strapi/design-system/Flex'; import { Link } from '@strapi/design-system/Link'; -import { H1, Text } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import UnauthenticatedLayout, { Column, LayoutContent, @@ -30,18 +30,18 @@ const Oops = () => { -

+ {formatMessage({ id: 'Auth.components.Oops.title', defaultMessage: 'Oops...' })} -

+
- {message} + {message} - + {formatMessage({ id: 'Auth.components.Oops.text.admin', defaultMessage: 'If this is a mistake, please contact your administrator.', })} - +
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js index 1ef1b47f52..43409c9a47 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js @@ -12,7 +12,7 @@ import { Button } from '@strapi/design-system/Button'; import { TextInput } from '@strapi/design-system/TextInput'; import { Checkbox } from '@strapi/design-system/Checkbox'; import { Grid, GridItem } from '@strapi/design-system/Grid'; -import { H1, Subtitle } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import EyeStriked from '@strapi/icons/EyeStriked'; import Eye from '@strapi/icons/Eye'; import { Form, useQuery, useNotification } from '@strapi/helper-plugin'; @@ -113,21 +113,21 @@ const Register = ({ fieldsToDisable, noSignin, onSubmit, schema }) => { -

+ {formatMessage({ id: 'Auth.form.welcome.title', defaultMessage: 'Welcome!', })} -

+
- + {formatMessage({ id: 'Auth.form.register.subtitle', defaultMessage: 'Your credentials are only used to authenticate yourself on the admin panel. All saved data will be stored in your own database.', })} - +
diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js index 6878985c28..443a5b1381 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js @@ -9,7 +9,7 @@ import { Flex } from '@strapi/design-system/Flex'; import { Link } from '@strapi/design-system/Link'; import { Button } from '@strapi/design-system/Button'; import { TextInput } from '@strapi/design-system/TextInput'; -import { H1, Text } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import EyeStriked from '@strapi/icons/EyeStriked'; import Eye from '@strapi/icons/Eye'; import styled from 'styled-components'; @@ -51,20 +51,25 @@ const ForgotPassword = ({ onSubmit, schema }) => { -

+ {formatMessage({ id: 'Auth.reset-password.title', defaultMessage: 'Reset password', })} -

+
{errors.errorMessage && ( - + {formatMessage({ id: errors.errorMessage, defaultMessage: 'An error occurred', })} - + )}
diff --git a/packages/core/admin/admin/src/pages/ProfilePage/index.js b/packages/core/admin/admin/src/pages/ProfilePage/index.js index f9c0be15be..a08804109d 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/index.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/index.js @@ -17,7 +17,7 @@ import pick from 'lodash/pick'; import omit from 'lodash/omit'; import { Helmet } from 'react-helmet'; import { Main } from '@strapi/design-system/Main'; -import { H3 } from '@strapi/design-system/Text'; +import { Typography } from '@strapi/design-system/Typography'; import { Box } from '@strapi/design-system/Box'; import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout'; import { Button } from '@strapi/design-system/Button'; @@ -192,12 +192,12 @@ const ProfilePage = () => { paddingRight={7} > -

+ {formatMessage({ id: 'Settings.profile.form.section.profile.title', defaultMessage: 'Profile', })} -

+ { paddingRight={7} > -

+ {formatMessage({ id: 'Settings.profile.form.section.password.title', defaultMessage: 'Change password', })} -

+ @@ -408,12 +408,12 @@ const ProfilePage = () => { paddingRight={7} > -

+ {formatMessage({ id: 'Settings.profile.form.section.experience.title', defaultMessage: 'Experience', })} -

+