Chore: Replace new typography (#23756)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
pull/23840/head
Júlia Jaeger Foresti 4 years ago committed by GitHub
parent 1a71c705d6
commit 76a4380c1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/theme/client/imports/general/base_old.css
  2. 2
      client/components/Card/Title.tsx
  3. 2
      client/components/GenericModal.tsx
  4. 2
      client/components/GenericTable/GenericTable.tsx
  5. 4
      client/components/GenericTable/NoResults.tsx
  6. 2
      client/components/Header/Subtitle.tsx
  7. 2
      client/components/Header/Title.tsx
  8. 2
      client/components/Message/Attachments/Attachment/AuthorName.tsx
  9. 2
      client/components/Message/Attachments/Attachment/Details.tsx
  10. 2
      client/components/Message/Attachments/Attachment/Text.tsx
  11. 2
      client/components/Message/Attachments/FieldsAttachment/Field.tsx
  12. 2
      client/components/Message/Attachments/components/Load.tsx
  13. 2
      client/components/Message/Attachments/components/Retry.tsx
  14. 2
      client/components/NotAuthorizedPage.tsx
  15. 2
      client/components/Omnichannel/modals/CloseChatModal.js
  16. 2
      client/components/Omnichannel/modals/ForwardChatModal.js
  17. 2
      client/components/Omnichannel/modals/ReturnChatQueueModal.tsx
  18. 2
      client/components/Omnichannel/modals/TranscriptModal.tsx
  19. 2
      client/components/Page/PageHeader.tsx
  20. 2
      client/components/PageSkeleton.tsx
  21. 2
      client/components/RoomForeword.js
  22. 2
      client/components/Sidebar/Header.js
  23. 2
      client/components/Sidebar/NavigationItem.js
  24. 2
      client/components/SortList/GroupingList.js
  25. 2
      client/components/SortList/SortListItem.js
  26. 2
      client/components/SortList/SortModeList.js
  27. 2
      client/components/SortList/ViewModeList.js
  28. 2
      client/components/Subtitle.js
  29. 2
      client/components/TextCopy.js
  30. 2
      client/components/UserCard/Info.js
  31. 2
      client/components/UserCard/UserCard.js
  32. 2
      client/components/UserCard/Username.js
  33. 2
      client/components/VerticalBar/VerticalBarHeader.tsx
  34. 2
      client/components/avatar/UserAvatarEditor/UserAvatarEditor.js
  35. 6
      client/components/data/Counter.js
  36. 2
      client/components/data/Growth.stories.js
  37. 2
      client/sidebar/header/EditStatusModal.tsx
  38. 2
      client/sidebar/header/UserDropdown.js
  39. 2
      client/sidebar/header/actions/CreateRoomListItem.js
  40. 2
      client/views/InfoPanel/Label.tsx
  41. 2
      client/views/InfoPanel/Text.tsx
  42. 2
      client/views/InfoPanel/Title.tsx
  43. 2
      client/views/account/preferences/MyDataModal.tsx
  44. 2
      client/views/account/security/BackupCodesModal.tsx
  45. 4
      client/views/account/security/EndToEnd.js
  46. 2
      client/views/account/security/TwoFactorEmail.js
  47. 4
      client/views/account/security/TwoFactorTOTP.js
  48. 2
      client/views/account/tokens/AccountTokensRow.tsx
  49. 2
      client/views/account/tokens/InfoModal.tsx
  50. 4
      client/views/admin/apps/APIsDisplay.tsx
  51. 18
      client/views/admin/apps/AppDetailsPageContent.tsx
  52. 2
      client/views/admin/apps/AppLogsPage.js
  53. 4
      client/views/admin/apps/AppPermissionsReviewModal.js
  54. 4
      client/views/admin/apps/AppRow.tsx
  55. 2
      client/views/admin/apps/AppUpdateModal.tsx
  56. 2
      client/views/admin/apps/AppsWhatIsIt.js
  57. 2
      client/views/admin/apps/CloudLoginModal.js
  58. 4
      client/views/admin/apps/MarketplaceRow.tsx
  59. 2
      client/views/admin/apps/SettingsDisplay.tsx
  60. 2
      client/views/admin/apps/WarningModal.js
  61. 2
      client/views/admin/cloud/CopyStep.tsx
  62. 2
      client/views/admin/cloud/PasteStep.tsx
  63. 65
      client/views/admin/customEmoji/CustomEmoji.js
  64. 2
      client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
  65. 2
      client/views/admin/customSounds/AdminSounds.js
  66. 2
      client/views/admin/customSounds/EditCustomSound.js
  67. 4
      client/views/admin/customUserStatus/CustomUserStatus.js
  68. 2
      client/views/admin/customUserStatus/EditCustomUserStatusWithData.tsx
  69. 2
      client/views/admin/emailInbox/SendTestButton.js
  70. 4
      client/views/admin/import/ImportProgressPage.js
  71. 4
      client/views/admin/import/PrepareImportPage.js
  72. 2
      client/views/admin/info/DescriptionListEntry.js
  73. 2
      client/views/admin/info/FederationCard/components/FederationModal/DNSText.tsx
  74. 2
      client/views/admin/info/FederationCard/components/FederationModal/FederationModal.tsx
  75. 2
      client/views/admin/info/FederationCard/components/FederationModal/InviteUsers.tsx
  76. 2
      client/views/admin/info/OfflineLicenseModal.js
  77. 2
      client/views/admin/info/UsagePieGraph.tsx
  78. 2
      client/views/admin/integrations/IncomingWebhookForm.js
  79. 2
      client/views/admin/integrations/IntegrationRow.js
  80. 2
      client/views/admin/integrations/OutgoiongWebhookForm.js
  81. 2
      client/views/admin/integrations/new/NewBot.js
  82. 2
      client/views/admin/integrations/new/NewZapier.js
  83. 2
      client/views/admin/invites/InviteRow.js
  84. 2
      client/views/admin/oauthApps/EditOauthAppWithData.js
  85. 2
      client/views/admin/oauthApps/OAuthAppsTable.js
  86. 4
      client/views/admin/permissions/UserRow.js
  87. 2
      client/views/admin/rooms/EditRoom.js
  88. 6
      client/views/admin/rooms/RoomsTable.js
  89. 2
      client/views/admin/settings/GroupPage.js
  90. 2
      client/views/admin/settings/GroupPageSkeleton.js
  91. 2
      client/views/admin/settings/Section.js
  92. 2
      client/views/admin/settings/SectionSkeleton.js
  93. 2
      client/views/admin/sidebar/AdminSidebarSettings.tsx
  94. 4
      client/views/admin/users/InviteUsers.js
  95. 2
      client/views/admin/users/UserForm.js
  96. 8
      client/views/admin/users/UserRow.js
  97. 12
      client/views/directory/ChannelsTable.js
  98. 8
      client/views/directory/TeamsTable.js
  99. 8
      client/views/directory/UserTable.js
  100. 2
      client/views/location/MapViewFallback.tsx
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1894,7 +1894,7 @@
font-family: inherit;
font-size: 0.875rem;
font-weight: 600;
font-weight: 700;
line-height: inherit;
}

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React, { FC } from 'react';
const Title: FC = ({ children }) => (
<Box mb='x8' fontScale='p2'>
<Box mb='x8' fontScale='p4'>
{children}
</Box>
);

@ -75,7 +75,7 @@ const GenericModal: FC<GenericModalProps> = ({
<Modal.Title>{title ?? t('Are_you_sure')}</Modal.Title>
<Modal.Close onClick={onClose} />
</Modal.Header>
<Modal.Content fontScale='p1'>{children}</Modal.Content>
<Modal.Content fontScale='p3'>{children}</Modal.Content>
<Modal.Footer>
<Box display='flex' flexDirection='row' justifyContent='space-between' alignItems='center'>
{dontAskAgain}

@ -88,7 +88,7 @@ const GenericTable = forwardRef(function GenericTable<
? renderFilter({ ...props, onChange: setFilter } as any) // TODO: ugh
: null}
{results && !results.length ? (
<Tile fontScale='p1' elevation='0' color='info' textAlign='center'>
<Tile fontScale='p3' elevation='0' color='info' textAlign='center'>
{t('No_data_found')}
</Tile>
) : (

@ -25,10 +25,10 @@ const NoResults: FC<NoResultsProps> = ({ icon, title, description, buttonTitle,
>
<Icon name={icon} size='x30' />
</Box>
<Box is='h1' fontScale='h1' flexGrow={1}>
<Box is='h2' fontScale='h2' flexGrow={1}>
{title}
</Box>
<Tile paddingBlockStart='x5' fontScale='p1' elevation='0' color='info' textAlign='center'>
<Tile paddingBlockStart='x5' fontScale='p3' elevation='0' color='info' textAlign='center'>
<Box margin='auto' maxWidth='400px'>
{description}
</Box>

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React, { FC } from 'react';
const Subtitle: FC<any> = (props) => (
<Box color='hint' fontScale='p1' withTruncatedText {...props} />
<Box color='hint' fontScale='p3' withTruncatedText {...props} />
);
export default Subtitle;

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React, { FC } from 'react';
const Title: FC<any> = (props) => (
<Box color='default' mi='x4' fontScale='s2' withTruncatedText {...props} />
<Box color='default' mi='x4' fontScale='h4' withTruncatedText {...props} />
);
export default Title;

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React, { ComponentProps, FC } from 'react';
const AuthorName: FC<ComponentProps<typeof Box>> = (props) => (
<Box withTruncatedText fontScale='p2' mi='x8' {...props} />
<Box withTruncatedText fontScale='p4' mi='x8' {...props} />
);
export default AuthorName;

@ -4,7 +4,7 @@ import React, { FC, ComponentProps } from 'react';
const Details: FC<ComponentProps<typeof Box>> = ({ ...props }) => (
<Box
rcx-attachment__details
fontScale='p1'
fontScale='p3'
color='info'
bg='neutral-100'
pi='x16'

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React, { ComponentProps, FC } from 'react';
const Text: FC<ComponentProps<typeof Box>> = (props) => (
<Box mbe='x4' mi='x2' fontScale='p1' color='default' {...props}></Box>
<Box mbe='x4' mi='x2' fontScale='p3' color='default' {...props}></Box>
);
export default Text;

@ -9,7 +9,7 @@ type FieldProps = {
const Field: FC<FieldProps> = ({ title, value, ...props }) => (
<Box mb='x4' pi='x4' width='full' flexBasis={100} flexShrink={0} {...props}>
<Box fontScale='p2' color='default'>
<Box fontScale='p4' color='default'>
{title}
</Box>
{value}

@ -22,7 +22,7 @@ const Load: FC<LoadProps> = ({ load, ...props }) => {
return (
<ImageBox className={clickable} {...props} onClick={load}>
<Icon name='image' color='neutral-700' size='x64' />
<Box fontScale='h1' color='default'>
<Box fontScale='h2' color='default'>
{t('Click_to_load')}
</Box>
</ImageBox>

@ -22,7 +22,7 @@ const Retry: FC<RetryProps> = ({ retry }) => {
return (
<ImageBox className={clickable} onClick={retry} size={160}>
<Icon name='refresh' color='neutral-700' size='x64' />
<Box fontScale='h1' color='default'>
<Box fontScale='h2' color='default'>
{t('Retry')}
</Box>
</ImageBox>

@ -10,7 +10,7 @@ const NotAuthorizedPage = (): ReactElement => {
return (
<Page>
<Page.Content pb='x24'>
<Box is='p' fontScale='p1'>
<Box is='p' fontScale='p3'>
{t('You_are_not_authorized_to_view_this_page')}
</Box>
</Page.Content>

@ -67,7 +67,7 @@ const CloseChatModal = ({ department = {}, onCancel, onConfirm }) => {
<Modal.Title>{t('Closing_chat')}</Modal.Title>
<Modal.Close onClick={onCancel} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
<Box color='neutral-600'>{t('Close_room_description')}</Box>
<Field marginBlock='x15'>
<Field.Label required={commentRequired}>{t('Comment')}</Field.Label>

@ -89,7 +89,7 @@ const ForwardChatModal = ({ onForward, onCancel, room, ...props }) => {
<Modal.Title>{t('Forward_chat')}</Modal.Title>
<Modal.Close onClick={onCancel} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
<Field mbe={'x30'}>
<Field.Label>{t('Forward_to_department')}</Field.Label>
<Field.Row>

@ -22,7 +22,7 @@ const ReturnChatQueueModal: FC<ReturnChatQueueModalProps> = ({
<Modal.Title>{t('Return_to_the_queue')}</Modal.Title>
<Modal.Close onClick={onCancel} />
</Modal.Header>
<Modal.Content fontScale='p1'>{t('Would_you_like_to_return_the_queue')}</Modal.Content>
<Modal.Content fontScale='p3'>{t('Would_you_like_to_return_the_queue')}</Modal.Content>
<Modal.Footer>
<Box>
<ButtonGroup align='end'>

@ -76,7 +76,7 @@ const TranscriptModal: FC<TranscriptModalProps> = ({
<Modal.Title>{t('Transcript')}</Modal.Title>
<Modal.Close onClick={onCancel} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
{!!transcriptRequest && <p>{t('Livechat_transcript_already_requested_warning')}</p>}
<Field marginBlock='x15'>
<Field.Label>{t('Email')}*</Field.Label>

@ -32,7 +32,7 @@ const PageHeader: FC<PageHeaderProps> = ({ children = undefined, title, ...props
<BurgerMenu />
</TemplateHeader.ToolBox>
)}
<Box is='h1' fontScale='h1' flexGrow={1}>
<Box is='h2' fontScale='h2' flexGrow={1}>
{title}
</Box>
{children}

@ -13,7 +13,7 @@ const PageSkeleton = (): ReactElement => (
<Page.Content>
<Box marginBlock='none' marginInline='auto' width='full' maxWidth='x580'>
<Box is='p' color='hint' fontScale='p1'>
<Box is='p' color='hint' fontScale='p3'>
<Skeleton />
<Skeleton />
<Skeleton width='75%' />

@ -45,7 +45,7 @@ const RoomForeword = ({ _id: rid }) => {
</Avatar.Stack>
</Margins>
</Flex.Item>
<Box color='default' fontScale='h1' flexGrow={1}>
<Box color='default' fontScale='h2' flexGrow={1}>
{t('Direct_message_you_have_joined')}
</Box>
<Box is='div' mb='x8' flexGrow={1} display='flex' justifyContent='center'>

@ -13,7 +13,7 @@ const Header = ({ title, onClose, children = undefined, ...props }) => (
flexGrow={1}
>
{title && (
<Box color='neutral-800' fontSize='p1' fontWeight='p1' flexShrink={1} withTruncatedText>
<Box color='neutral-800' fontSize='p3' fontWeight='p3' flexShrink={1} withTruncatedText>
{title}
</Box>
)}

@ -22,7 +22,7 @@ const NavigationItem = ({
return (
<Sidebar.GenericItem active={isActive} href={path} key={path}>
{icon && <Icon name={icon} size='x20' mi='x4' />}
<Box withTruncatedText fontScale='p1' mi='x4' color='info'>
<Box withTruncatedText fontScale='p3' mi='x4' color='info'>
{label}{' '}
{tag && (
<Tag style={{ display: 'inline', backgroundColor: '#000', color: '#FFF', marginLeft: 4 }}>

@ -28,7 +28,7 @@ function GroupingList() {
return (
<>
<Margins block='x8'>
<Box is='p' style={style} fontScale='micro'>
<Box is='p' style={style} fontScale='c1'>
{t('Group_by')}
</Box>
</Margins>

@ -14,7 +14,7 @@ function SortListItem({ text, icon, input }) {
</Flex.Item>
<Margins inline='x8'>
<Flex.Item grow={1}>
<Box is='span' fontScale='p2' pie='x24'>
<Box is='span' fontScale='p4' pie='x24'>
{text}
</Box>
</Flex.Item>

@ -24,7 +24,7 @@ function SortModeList() {
return (
<>
<Margins block='x8'>
<Box is='p' style={style} fontScale='micro'>
<Box is='p' style={style} fontScale='c1'>
{t('Sort_By')}
</Box>
</Margins>

@ -33,7 +33,7 @@ function ViewModeList() {
return (
<>
<Margins block='x8'>
<Box is='p' style={style} fontScale='micro'>
<Box is='p' style={style} fontScale='c1'>
{t('Display')}
</Box>
</Margins>

@ -6,7 +6,7 @@ function Subtitle(props) {
<Box
color='default'
fontFamily='sans'
fontScale='s1'
fontScale='h4'
marginBlockEnd='x8'
withRichContent
{...props}

@ -8,7 +8,7 @@ const defaultWrapperRenderer = (text) => (
<Box
fontFamily='mono'
alignSelf='center'
fontScale='p1'
fontScale='p3'
style={{ wordBreak: 'break-all' }}
mie='x4'
flexGrow={1}

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React from 'react';
const Info = (props) => (
<Box mbe='x4' is='span' fontScale='p1' color='hint' withTruncatedText {...props} />
<Box mbe='x4' is='span' fontScale='p3' color='hint' withTruncatedText {...props} />
);
export default Info;

@ -63,7 +63,7 @@ const UserCard = forwardRef(function UserCard(
<Box withTruncatedText display='flex'>
<Username status={status} name={name} title={username !== name ? username : undefined} />
{nickname && (
<Box title={t('Nickname')} color='hint' mis='x8' fontScale='p1' withTruncatedText>
<Box title={t('Nickname')} color='hint' mis='x8' fontScale='p3' withTruncatedText>
({nickname})
</Box>
)}

@ -10,7 +10,7 @@ const Username = ({ name, status = <UserStatus.Offline />, title, ...props }) =>
title={title}
flexShrink={0}
alignItems='center'
fontScale='s2'
fontScale='h4'
color='default'
withTruncatedText
>

@ -21,7 +21,7 @@ const VerticalBarHeader: FC<{ children: ReactNode; props?: ComponentProps<typeof
display='flex'
alignItems='center'
justifyContent='space-between'
fontScale='s2'
fontScale='h4'
flexGrow={1}
overflow='hidden'
color='neutral-800'

@ -59,7 +59,7 @@ function UserAvatarEditor({
};
return (
<Box display='flex' flexDirection='column' fontScale='p2'>
<Box display='flex' flexDirection='column' fontScale='p4'>
{t('Profile_picture')}
<Box display='flex' flexDirection='row' mbs='x4'>
<UserAvatar

@ -11,7 +11,7 @@ function Counter({ count, variation = 0, description }) {
<Box
is='span'
color='default'
fontScale='h1'
fontScale='h2'
style={{
fontSize: '3em',
lineHeight: 1,
@ -19,12 +19,12 @@ function Counter({ count, variation = 0, description }) {
>
{count}
</Box>
<Growth fontScale='s1'>{variation}</Growth>
<Growth fontScale='h4'>{variation}</Growth>
</Box>
</Flex.Container>
<Margins block='x12'>
<Flex.Container alignItems='center'>
<Box fontScale='p1' color='hint'>
<Box fontScale='p3' color='hint'>
{description}
</Box>
</Flex.Container>

@ -16,7 +16,7 @@ export const Zero = () => <Growth>{0}</Growth>;
export const Negative = () => <Growth>{-3}</Growth>;
export const WithTextStyle = () =>
['h1', 's1', 'c1', 'micro'].map((fontScale) => (
['h2', 's1', 'c1', 'micro'].map((fontScale) => (
<Box key={fontScale}>
<Growth fontScale={fontScale}>{3}</Growth>
<Growth fontScale={fontScale}>{-3}</Growth>

@ -68,7 +68,7 @@ const EditStatusModal = ({
<Modal.Title>{t('Edit_Status')}</Modal.Title>
<Modal.Close onClick={onClose} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
<FieldGroup>
<Field>
<Field.Label>{t('StatusMessage')}</Field.Label>

@ -105,7 +105,7 @@ const UserDropdown = ({ user, onClose }) => {
display='flex'
overflow='hidden'
flexDirection='column'
fontScale='p1'
fontScale='p3'
mb='neg-x4'
flexGrow={1}
flexShrink={1}

@ -14,7 +14,7 @@ export default function CreateRoomListItem({ text, icon, action }) {
</Flex.Item>
<Margins inline='x8'>
<Flex.Item grow={1}>
<Box is='span' fontScale='p2'>
<Box is='span' fontScale='p4'>
{text}
</Box>
</Flex.Item>

@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage';
import React, { ComponentProps, FC } from 'react';
const Label: FC<ComponentProps<typeof Box>> = (props) => (
<Box mb='x8' fontScale='p2' color='default' {...props} />
<Box mb='x8' fontScale='p4' color='default' {...props} />
);
export default Label;

@ -7,7 +7,7 @@ const wordBreak = css`
`;
const Text: FC<ComponentProps<typeof Box>> = (props) => (
<Box mb='x8' fontScale='p1' color='hint' withTruncatedText className={wordBreak} {...props} />
<Box mb='x8' fontScale='p3' color='hint' withTruncatedText className={wordBreak} {...props} />
);
export default Text;

@ -12,7 +12,7 @@ const Title: FC<TitleProps> = ({ title, icon }) => (
title={title}
flexShrink={0}
alignItems='center'
fontScale='s2'
fontScale='h4'
color='default'
withTruncatedText
>

@ -19,7 +19,7 @@ const MyDataModal: FC<MyDataModalProps> = ({ onCancel, title, text, ...props })
<Modal.Title>{title}</Modal.Title>
<Modal.Close onClick={onCancel} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
<Box mb='x8'>{text}</Box>
</Modal.Content>
<Modal.Footer>

@ -21,7 +21,7 @@ const BackupCodesModal: FC<BackupCodesModalProps> = ({ codes, onClose, ...props
<Modal.Title>{t('Backup_codes')}</Modal.Title>
<Modal.Close onClick={onClose} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
<Box mb='x8' withRichContent>
{t('Make_sure_you_have_a_copy_of_your_codes_1')}
</Box>

@ -75,7 +75,7 @@ const EndToEnd = (props) => {
return (
<Box display='flex' flexDirection='column' alignItems='flex-start' mbs='x16' {...props}>
<Margins blockEnd='x8'>
<Box fontScale='s2'>{t('E2E_Encryption_Password_Change')}</Box>
<Box fontScale='h4'>{t('E2E_Encryption_Password_Change')}</Box>
<Box dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
<FieldGroup w='full'>
<Field>
@ -106,7 +106,7 @@ const EndToEnd = (props) => {
<Button primary disabled={!canSave} onClick={saveNewPassword}>
{t('Save_changes')}
</Button>
<Box fontScale='s2' mbs='x16'>
<Box fontScale='h4' mbs='x16'>
{t('Reset_E2E_Key')}
</Box>
<Box dangerouslySetInnerHTML={{ __html: t('E2E_Reset_Key_Explanation') }} />

@ -35,7 +35,7 @@ const TwoFactorEmail = (props) => {
return (
<Box display='flex' flexDirection='column' alignItems='flex-start' mbs='x16' {...props}>
<Margins blockEnd='x8'>
<Box fontScale='s2'>{t('Two-factor_authentication_email')}</Box>
<Box fontScale='h4'>{t('Two-factor_authentication_email')}</Box>
{isEnabled && (
<Button primary danger onClick={handleDisable}>
{t('Disable_two-factor_authentication_email')}

@ -115,7 +115,7 @@ const TwoFactorTOTP = (props) => {
return (
<Box display='flex' flexDirection='column' alignItems='flex-start' {...props}>
<Margins blockEnd='x8'>
<Box fontScale='s2'>{t('Two-factor_authentication')}</Box>
<Box fontScale='h4'>{t('Two-factor_authentication')}</Box>
{!totpEnabled && !registeringTotp && (
<>
<Box>{t('Two-factor_authentication_is_currently_disabled')}</Box>
@ -147,7 +147,7 @@ const TwoFactorTOTP = (props) => {
<Button primary danger onClick={handleDisableTotp}>
{t('Disable_two-factor_authentication')}
</Button>
<Box fontScale='p2' mbs='x8'>
<Box fontScale='p4' mbs='x8'>
{t('Backup_codes')}
</Box>
<Box>{t('You_have_n_codes_remaining', { number: codesRemaining })}</Box>

@ -30,7 +30,7 @@ const AccountTokensRow: FC<AccountTokensRowProps> = ({
return (
<Table.Row key={name} tabIndex={0} role='link' action qa-token-name={name}>
<Table.Cell withTruncatedText color='default' fontScale='p2'>
<Table.Cell withTruncatedText color='default' fontScale='p4'>
{name}
</Table.Cell>
{isMedium && <Table.Cell withTruncatedText>{formatDateAndTime(createdAt)}</Table.Cell>}

@ -27,7 +27,7 @@ const InfoModal: FC<InfoModalProps> = ({
<Modal.Title>{title}</Modal.Title>
<Modal.Close onClick={onClose} />
</Modal.Header>
<Modal.Content fontScale='p1'>{content}</Modal.Content>
<Modal.Content fontScale='p3'>{content}</Modal.Content>
<Modal.Footer>
<ButtonGroup align='end'>
{cancelText && <Button onClick={onClose}>{cancelText}</Button>}

@ -25,12 +25,12 @@ const APIsDisplay: FC<APIsDisplayProps> = ({ apis }) => {
<>
<Divider />
<Box display='flex' flexDirection='column'>
<Box fontScale='s2' mb='x12'>
<Box fontScale='h4' mb='x12'>
{t('APIs')}
</Box>
{apis.map((api) => (
<Box key={api.path} mb='x8'>
<Box fontScale='p2'>
<Box fontScale='p4'>
{api.methods.join(' | ').toUpperCase()} {api.path}
</Box>
{api.methods.map((method) => (

@ -42,9 +42,9 @@ const AppDetailsPageContent: FC<AppDetailsPageContentProps> = ({ data }) => {
iconFileData={iconFileData}
/>
<Box display='flex' flexDirection='column' justifyContent='space-between' flexGrow={1}>
<Box fontScale='h1'>{name}</Box>
<Box fontScale='h2'>{name}</Box>
<Box display='flex' flexDirection='row' color='hint' alignItems='center'>
<Box fontScale='p2' mie='x4'>
<Box fontScale='p4' mie='x4'>
{t('By_author', { author: authorName })}
</Box>
|<Box mis='x4'>{t('Version_version', { version })}</Box>
@ -97,7 +97,7 @@ const AppDetailsPageContent: FC<AppDetailsPageContentProps> = ({ data }) => {
<Box display='flex' flexDirection='column'>
<Margins block='x12'>
<Box fontScale='s2'>{t('Categories')}</Box>
<Box fontScale='h4'>{t('Categories')}</Box>
<Box display='flex' flexDirection='row'>
{categories &&
categories.map((current) => (
@ -107,7 +107,7 @@ const AppDetailsPageContent: FC<AppDetailsPageContentProps> = ({ data }) => {
))}
</Box>
<Box fontScale='s2'>{t('Contact')}</Box>
<Box fontScale='h4'>{t('Contact')}</Box>
<Box
display='flex'
flexDirection='row'
@ -116,20 +116,20 @@ const AppDetailsPageContent: FC<AppDetailsPageContentProps> = ({ data }) => {
flexWrap='wrap'
>
<Box display='flex' flexDirection='column' mie='x12' flexGrow={1}>
<Box fontScale='s1' color='hint'>
<Box fontScale='h4' color='hint'>
{t('Author_Site')}
</Box>
<ExternalLink to={homepage} />
</Box>
<Box display='flex' flexDirection='column' flexGrow={1}>
<Box fontScale='s1' color='hint'>
<Box fontScale='h4' color='hint'>
{t('Support')}
</Box>
<ExternalLink to={support} />
</Box>
</Box>
<Box fontScale='s2'>{t('Details')}</Box>
<Box fontScale='h4'>{t('Details')}</Box>
<Box display='flex' flexDirection='row'>
{description}
</Box>
@ -140,7 +140,7 @@ const AppDetailsPageContent: FC<AppDetailsPageContentProps> = ({ data }) => {
<Divider />
<Box display='flex' flexDirection='column'>
<Margins block='x12'>
<Box fontScale='s2'>{t('Bundles')}</Box>
<Box fontScale='h4'>{t('Bundles')}</Box>
{bundledIn.map((bundle) => (
<Box key={bundle.bundleId} display='flex' flexDirection='row' alignItems='center'>
<Box
@ -162,7 +162,7 @@ const AppDetailsPageContent: FC<AppDetailsPageContentProps> = ({ data }) => {
))}
</Box>
<Box display='flex' flexDirection='column' mis='x12'>
<Box fontScale='p2'>{bundle.bundleName}</Box>
<Box fontScale='p4'>{bundle.bundleName}</Box>
{bundle.apps.map((app) => (
<Box key={app.latest.name}>{app.latest.name},</Box>
))}

@ -81,7 +81,7 @@ function AppLogsPage({ id, ...props }) {
<Page.ScrollableContent>
{loading && <LogsLoading />}
{app.error && (
<Box maxWidth='x600' alignSelf='center' fontScale='h1'>
<Box maxWidth='x600' alignSelf='center' fontScale='hh21'>
{app.error.message}
</Box>
)}

@ -25,10 +25,10 @@ const AppPermissionsReviewModal = ({ appPermissions, cancel, confirm, modalProps
<Modal.Title>{t('Apps_Permissions_Review_Modal_Title')}</Modal.Title>
<Modal.Close onClick={handleCloseButtonClick} />
</Modal.Header>
<Modal.Content marginBlockEnd={20} fontScale='p1'>
<Modal.Content marginBlockEnd={20} fontScale='p3'>
{t('Apps_Permissions_Review_Modal_Subtitle')}
</Modal.Content>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
<ul>
{appPermissions.length
? appPermissions.map((permission, count) => (

@ -74,10 +74,10 @@ const AppRow: FC<AppRowProps> = ({ medium, ...props }) => {
iconFileData={iconFileData}
/>
<Box display='flex' flexDirection='column' alignSelf='flex-start'>
<Box color='default' fontScale='p2'>
<Box color='default' fontScale='p4'>
{name}
</Box>
<Box color='default' fontScale='p2'>{`${t('By')} ${authorName}`}</Box>
<Box color='default' fontScale='p4'>{`${t('By')} ${authorName}`}</Box>
</Box>
</Table.Cell>
{medium && (

@ -30,7 +30,7 @@ const AppUpdateModal: FC<AppUpdateModalProps> = ({ confirm, cancel, ...props })
<Modal.Title>{t('Apps_Manual_Update_Modal_Title')}</Modal.Title>
<Modal.Close onClick={handleCloseButtonClick} />
</Modal.Header>
<Modal.Content fontScale='p1'>{t('Apps_Manual_Update_Modal_Body')}</Modal.Content>
<Modal.Content fontScale='p3'>{t('Apps_Manual_Update_Modal_Body')}</Modal.Content>
<Modal.Footer>
<ButtonGroup align='end'>
<Button ghost onClick={handleCancelButtonClick}>

@ -38,7 +38,7 @@ function AppsWhatIsIt() {
<Page.Header title={t('Apps_WhatIsIt')} />
<Page.ScrollableContent>
{error ? (
<Box fontScale='s1' maxWidth='x600' alignSelf='center'>
<Box fontScale='h4' maxWidth='x600' alignSelf='center'>
{error.message}
</Box>
) : (

@ -30,7 +30,7 @@ const CloudLoginModal = (props) => {
<Modal.Title>{t('Apps_Marketplace_Login_Required_Title')}</Modal.Title>
<Modal.Close onClick={handleCloseButtonClick} />
</Modal.Header>
<Modal.Content fontScale='p1'>
<Modal.Content fontScale='p3'>
{t('Apps_Marketplace_Login_Required_Description')}
</Modal.Content>
<Modal.Footer>

@ -79,10 +79,10 @@ const MarketplaceRow: FC<MarketplaceRowProps> = ({ medium, large, ...props }) =>
iconFileData={iconFileData}
/>
<Box display='flex' flexDirection='column' alignSelf='flex-start'>
<Box color='default' fontScale='p2'>
<Box color='default' fontScale='p4'>
{name}
</Box>
<Box color='default' fontScale='p2'>{`${t('By')} ${authorName}`}</Box>
<Box color='default' fontScale='p4'>{`${t('By')} ${authorName}`}</Box>
</Box>
</Table.Cell>
{large && (

@ -44,7 +44,7 @@ const SettingsDisplay: FC<SettingsDisplayProps> = ({
<>
<Divider />
<Box display='flex' flexDirection='column'>
<Box fontScale='s2' mb='x12'>
<Box fontScale='h4' mb='x12'>
{t('Settings')}
</Box>
<AppSettingsAssembler settings={settings} values={values} handlers={handlers} />

@ -12,7 +12,7 @@ const WarningModal = ({ text, confirmText, close, cancel, cancelText, confirm, .
<Modal.Title>{t('Are_you_sure')}</Modal.Title>
<Modal.Close onClick={close} />
</Modal.Header>
<Modal.Content fontScale='p1'>{text}</Modal.Content>
<Modal.Content fontScale='p3'>{text}</Modal.Content>
<Modal.Footer>
<ButtonGroup align='end'>
<Button ghost onClick={cancel || close}>

@ -64,7 +64,7 @@ const CopyStep: FC<CopyStepProps> = ({ onNextButtonClick }) => {
<Box
height='x108'
fontFamily='mono'
fontScale='p1'
fontScale='p3'
color='alternative'
style={{ wordBreak: 'break-all' }}
>

@ -56,7 +56,7 @@ const PasteStep: FC<PasteStepProps> = ({ onBackButtonClick, onFinish }) => {
is='textarea'
height='x108'
fontFamily='mono'
fontScale='p1'
fontScale='p3'
color='alternative'
style={{ wordBreak: 'break-all', resize: 'none' }}
placeholder={t('Paste_here')}

@ -0,0 +1,65 @@
import { Box, Table } from '@rocket.chat/fuselage';
import React, { useMemo } from 'react';
import FilterByText from '../../../components/FilterByText';
import GenericTable from '../../../components/GenericTable';
import { useTranslation } from '../../../contexts/TranslationContext';
function CustomEmoji({ data, sort, onClick, onHeaderClick, setParams, params }) {
const t = useTranslation();
const header = useMemo(
() => [
<GenericTable.HeaderCell
key='name'
direction={sort[1]}
active={sort[0] === 'name'}
onClick={onHeaderClick}
sort='name'
w='x200'
>
{t('Name')}
</GenericTable.HeaderCell>,
<GenericTable.HeaderCell key='aliases' w='x200'>
{t('Aliases')}
</GenericTable.HeaderCell>,
],
[onHeaderClick, sort, t],
);
const renderRow = (emojis) => {
const { _id, name, aliases } = emojis;
return (
<Table.Row
key={_id}
onKeyDown={onClick(_id, emojis)}
onClick={onClick(_id, emojis)}
tabIndex={0}
role='link'
action
qa-user-id={_id}
>
<Table.Cell fontScale='p3' color='default'>
<Box withTruncatedText>{name}</Box>
</Table.Cell>
<Table.Cell fontScale='p3' color='default'>
<Box withTruncatedText>{aliases}</Box>
</Table.Cell>
</Table.Row>
);
};
return (
<GenericTable
header={header}
renderRow={renderRow}
results={data?.emojis ?? []}
total={data?.total ?? 0}
setParams={setParams}
params={params}
renderFilter={({ onChange, ...props }) => <FilterByText onChange={onChange} {...props} />}
/>
);
}
export default CustomEmoji;

@ -53,7 +53,7 @@ const EditCustomEmojiWithData: FC<EditCustomEmojiWithDataProps> = ({ _id, onChan
if (error || !data || !data.emojis || data.emojis.update.length < 1) {
return (
<Box fontScale='h1' pb='x20'>
<Box fontScale='h2' pb='x20'>
{t('Custom_User_Status_Error_Invalid_User_Status')}
</Box>
);

@ -47,7 +47,7 @@ function AdminSounds({ data, sort, onClick, onHeaderClick, setParams, params })
action
qa-user-id={_id}
>
<Table.Cell fontScale='p1' color='default'>
<Table.Cell fontScale='p3' color='default'>
<Box withTruncatedText>{name}</Box>
</Table.Cell>
<Table.Cell alignItems={'end'}>

@ -36,7 +36,7 @@ function EditCustomSound({ _id, onChange, ...props }) {
if (error || !data || data.sounds.length < 1) {
return (
<Box fontScale='h1' pb='x20'>
<Box fontScale='h2' pb='x20'>
{error}
</Box>
);

@ -47,10 +47,10 @@ function CustomUserStatus({ data, sort, onClick, onHeaderClick, setParams, param
action
qa-user-id={_id}
>
<Table.Cell fontScale='p1' color='default' style={style}>
<Table.Cell fontScale='p3' color='default' style={style}>
{name}
</Table.Cell>
<Table.Cell fontScale='p1' color='default' style={style}>
<Table.Cell fontScale='p3' color='default' style={style}>
{statusType}
</Table.Cell>
</Table.Row>

@ -53,7 +53,7 @@ export const EditCustomUserStatusWithData: FC<EditCustomUserStatusWithDataProps>
if (error || !data || data.statuses.length < 1) {
return (
<Box fontScale='h1' pb='x20'>
<Box fontScale='h2' pb='x20'>
{t('Custom_User_Status_Error_Invalid_User_Status')}
</Box>
);

@ -12,7 +12,7 @@ function SendTestButton({ id }) {
const sendTest = useEndpoint('POST', `email-inbox.send-test/${id}`);
return (
<Table.Cell fontScale='p1' color='hint' withTruncatedText>
<Table.Cell fontScale='p3' color='hint' withTruncatedText>
<Button
small
ghost

@ -153,13 +153,13 @@ function ImportProgressPage() {
<Page.ScrollableContentWithShadow>
<Box marginInline='auto' marginBlock='neg-x24' width='full' maxWidth='x580'>
<Margins block='x24'>
<Box is='p' fontScale='p1'>
<Box is='p' fontScale='p3'>
{t(step[0].toUpperCase() + step.slice(1))}
</Box>
{progressRate ? (
<Box display='flex' justifyContent='center'>
<Box is='progress' value={completed} max={total} marginInlineEnd='x24' />
<Box is='span' fontScale='p1'>
<Box is='span' fontScale='p3'>
{completed}/{total} ({s.numberFormat(progressRate, 0)}%)
</Box>
</Box>

@ -210,7 +210,7 @@ function PrepareImportPage() {
<Page.ScrollableContentWithShadow>
<Box marginInline='auto' marginBlock='x24' width='full' maxWidth='590px'>
<Box is='h2' fontScale='p2'>
<Box is='h2' fontScale='p4'>
{statusDebounced && t(statusDebounced.replace('importer_', 'importer_status_'))}
</Box>
{!isPreparing && (
@ -235,7 +235,7 @@ function PrepareImportPage() {
{isPreparing && (
<>
{progressRate ? (
<Box display='flex' justifyContent='center' fontScale='p1'>
<Box display='flex' justifyContent='center' fontScale='p3'>
<Box
is='progress'
value={(progressRate * 10).toFixed(0)}

@ -11,7 +11,7 @@ const DescriptionListEntry = ({ children, label, ...props }) => (
align='end'
color='hint'
backgroundColor='surface'
fontScale='p2'
fontScale='p4'
style={style}
>
{label}

@ -4,7 +4,7 @@ import React, { FC } from 'react';
export const DNSText: FC<{
text: string;
}> = ({ text }) => (
<Box mbs='x8' fontWeight='c2' fontSize='p1'>
<Box mbs='x8' fontWeight='c2' fontSize='p3'>
{text}
</Box>
);

@ -182,7 +182,7 @@ export const FederationModal: FC<{ onClose: () => void }> = ({
{currentTab === 2 && (
<>
<Box mbe='x16'>
<Box is='p' fontWeight='c2' fontSize='p1'>
<Box is='p' fontWeight='c2' fontSize='p3'>
{t('Federation_SRV_no_support')}
</Box>
<Box is='p' mbs='x8' fontSize='x12'>

@ -15,7 +15,7 @@ const InviteUsers: FC<{ onClose: () => void }> = ({ onClose }): ReactElement =>
return (
<Box display='flex' flexDirection='column' alignItems='stretch' flexGrow={1}>
<Box fontWeight='c2' fontSize='p1'>
<Box fontWeight='c2' fontSize='p3'>
{t('Federation_Inviting_users_from_another_server')}
</Box>
<Box mbs='x16'>{t('Federation_Search_users_you_want_to_connect')}</Box>

@ -84,7 +84,7 @@ const OfflineLicenseModal = ({ onClose, license, licenseStatus, ...props }) => {
is='textarea'
height='x108'
fontFamily='mono'
fontScale='p1'
fontScale='p3'
color='alternative'
style={{ wordBreak: 'break-all', resize: 'none' }}
placeholder={t('Paste_here')}

@ -77,7 +77,7 @@ const UsageGraph = ({ used = 0, total = 0, label, color, size }: UsageGraphProps
justifyContent='center'
position='absolute'
color={color}
fontScale='p2'
fontScale='p4'
style={{ left: 0, right: 0, top: 0, bottom: 0 }}
>
{unlimited ? '∞' : localePercentage}

@ -294,7 +294,7 @@ export default function IncomingWebhookForm({
<Field>
<Field.Label>{t('Example_payload')}</Field.Label>
<Field.Row>
<Box fontScale='p1' withRichContent flexGrow={1}>
<Box fontScale='p3' withRichContent flexGrow={1}>
<pre>
<code dangerouslySetInnerHTML={{ __html: hilightedExampleJson }}></code>
</pre>

@ -21,7 +21,7 @@ function IntegrationRow({
const handler = useMemo(() => onClick(_id, type), [onClick, _id, type]);
return (
<Table.Row key={_id} onKeyDown={handler} onClick={handler} tabIndex={0} role='link' action>
<Table.Cell style={style} color='default' fontScale='p2'>
<Table.Cell style={style} color='default' fontScale='p4'>
{name}
</Table.Cell>
<Table.Cell style={style}>{channel.join(', ')}</Table.Cell>

@ -382,7 +382,7 @@ export default function OutgoingWebhookForm({ formValues, formHandlers, append,
<Field.Label>{t('Responding')}</Field.Label>
<Field.Hint>{t('Response_description_pre')}</Field.Hint>
<Field.Row>
<Box fontScale='p1' withRichContent flexGrow={1}>
<Box fontScale='p3' withRichContent flexGrow={1}>
<pre>
<code dangerouslySetInnerHTML={{ __html: hilightedExampleJson }}></code>
</pre>

@ -8,7 +8,7 @@ export default function NewBot() {
return (
<Box
pb='x20'
fontScale='s1'
fontScale='h4'
key='bots'
dangerouslySetInnerHTML={{ __html: t('additional_integrations_Bots') }}
/>

@ -36,7 +36,7 @@ export default function NewZapier({ ...props }) {
<>
<Box
pb='x20'
fontScale='s1'
fontScale='h4'
dangerouslySetInnerHTML={{ __html: t('additional_integrations_Zapier') }}
/>
{!script && (

@ -76,7 +76,7 @@ function InviteRow({ _id, createdAt, expires, days, uses, maxUses, onRemove }) {
return (
<Table.Row>
<Table.Cell>
<Box color='hint' fontScale='p1'>
<Box color='hint' fontScale='p3'>
{_id}
</Box>
</Table.Cell>

@ -42,7 +42,7 @@ function EditOauthAppWithData({ _id, ...props }) {
if (error || !data || !_id) {
return (
<Box fontScale='h1' pb='x20'>
<Box fontScale='h2' pb='x20'>
{t('error-application-not-found')}
</Box>
);

@ -47,7 +47,7 @@ export function OAuthAppsTable() {
action
qa-oauth-app-id={_id}
>
<Table.Cell withTruncatedText color='default' fontScale='p2'>
<Table.Cell withTruncatedText color='default' fontScale='p4'>
{name}
</Table.Cell>
<Table.Cell withTruncatedText>{createdBy}</Table.Cell>

@ -19,11 +19,11 @@ const UserRow = ({ _id, username, name, avatarETag, emails, onRemove }) => {
<UserAvatar size='x40' title={username} username={username} etag={avatarETag} />
<Box display='flex' withTruncatedText mi='x8'>
<Box display='flex' flexDirection='column' alignSelf='center' withTruncatedText>
<Box fontScale='p2' withTruncatedText color='default'>
<Box fontScale='p4' withTruncatedText color='default'>
{name || username}
</Box>
{name && (
<Box fontScale='p1' color='hint' withTruncatedText>
<Box fontScale='p3' color='hint' withTruncatedText>
{' '}
{`@${username}`}{' '}
</Box>

@ -193,7 +193,7 @@ function EditRoom({ room, onChange }) {
<Field>
<Field.Label>{t('Owner')}</Field.Label>
<Field.Row>
<Box fontScale='p1'>{room.u?.username}</Box>
<Box fontScale='p3'>{room.u?.username}</Box>
</Field.Row>
</Field>
{canViewDescription && (

@ -233,10 +233,10 @@ function RoomsTable() {
<Icon
mi='x2'
name={icon === 'omnichannel' ? 'livechat' : icon}
fontScale='p2'
fontScale='p4'
color='hint'
/>
<Box fontScale='p2' style={style} color='default'>
<Box fontScale='p4' style={style} color='default'>
{roomName}
</Box>
</Box>
@ -244,7 +244,7 @@ function RoomsTable() {
</Box>
</Table.Cell>
<Table.Cell>
<Box color='hint' fontScale='p2' style={style}>
<Box color='hint' fontScale='p4' style={style}>
{t(getRoomType(room))}
</Box>
<Box mi='x4' />

@ -148,7 +148,7 @@ function GroupPage({
<Page.ScrollableContentWithShadow>
<Box marginBlock='none' marginInline='auto' width='full' maxWidth='x580'>
{t.has(i18nDescription) && (
<Box is='p' color='hint' fontScale='p1'>
<Box is='p' color='hint' fontScale='p3'>
{t(i18nDescription)}
</Box>
)}

@ -18,7 +18,7 @@ function GroupPageSkeleton() {
<Page.Content>
<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
<Box is='p' color='hint' fontScale='p1'>
<Box is='p' color='hint' fontScale='p3'>
<Skeleton />
<Skeleton />
<Skeleton width='75%' />

@ -73,7 +73,7 @@ function Section({
title={sectionName && t(sectionName)}
>
{help && (
<Box is='p' color='hint' fontScale='p1'>
<Box is='p' color='hint' fontScale='p3'>
{help}
</Box>
)}

@ -6,7 +6,7 @@ import Setting from './Setting';
function SectionSkeleton() {
return (
<Accordion.Item noncollapsible title={<Skeleton />}>
<Box is='p' color='hint' fontScale='p1'>
<Box is='p' color='hint' fontScale='p3'>
<Skeleton />
</Box>

@ -71,7 +71,7 @@ const AdminSidebarSettings: FC<AdminSidebarSettingsProps> = ({ currentPath }) =>
return (
<Box is='section' display='flex' flexDirection='column' flexShrink={0} pb='x24'>
<Box pi='x24' pb='x8' fontScale='p2' color='info'>
<Box pi='x24' pb='x8' fontScale='p4' color='info'>
{t('Settings')}
</Box>
<Box pi='x24' pb='x8' display='flex'>

@ -23,10 +23,10 @@ export function InviteUsers({ data, ...props }) {
};
return (
<VerticalBar.ScrollableContent {...props}>
<Box is='h2' fontScale='h1' mb='x8'>
<Box is='h2' fontScale='h2' mb='x8'>
{t('Send_invitation_email')}
</Box>
<Box fontScale='p1' mb='x8'>
<Box fontScale='p3' mb='x8'>
{t('Send_invitation_email_info')}
</Box>
<TextAreaInput rows={5} flexGrow={0} onChange={(e) => setText(e.currentTarget.value)} />

@ -316,7 +316,7 @@ export default function UserForm({
{hasCustomFields && (
<>
<Divider />
<Box fontScale='s2'>{t('Custom_Fields')}</Box>
<Box fontScale='h4'>{t('Custom_Fields')}</Box>
</>
)}
<CustomFieldsForm

@ -45,11 +45,11 @@ const UserRow = ({
/>
<Box display='flex' style={style} mi='x8'>
<Box display='flex' flexDirection='column' alignSelf='center' style={style}>
<Box fontScale='p2' style={style} color='default'>
<Box fontScale='p4' style={style} color='default'>
{name || username}
</Box>
{!mediaQuery && name && (
<Box fontScale='p1' color='hint' style={style}>
<Box fontScale='p3' color='hint' style={style}>
{' '}
{`@${username}`}{' '}
</Box>
@ -60,7 +60,7 @@ const UserRow = ({
</Table.Cell>
{mediaQuery && (
<Table.Cell>
<Box fontScale='p2' style={style} color='hint'>
<Box fontScale='p4' style={style} color='hint'>
{username}
</Box>{' '}
<Box mi='x4' />
@ -68,7 +68,7 @@ const UserRow = ({
)}
<Table.Cell style={style}>{emails && emails.length && emails[0].address}</Table.Cell>
{mediaQuery && <Table.Cell style={style}>{roles && roles.join(', ')}</Table.Cell>}
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{statusText}
</Table.Cell>
</Table.Row>

@ -134,7 +134,7 @@ function ChannelsTable() {
<Box grow={1} mi='x8' style={style}>
<Box display='flex' alignItems='center'>
<Icon name={roomTypes.getIcon(room)} color='hint' />{' '}
<Box fontScale='p2' mi='x4'>
<Box fontScale='p4' mi='x4'>
{fname || name}
</Box>
<RoomTags room={room} style={style} />
@ -142,7 +142,7 @@ function ChannelsTable() {
{topic && (
<MarkdownText
variant='inlineWithoutBreaks'
fontScale='p1'
fontScale='p3'
color='hint'
style={style}
content={topic}
@ -151,21 +151,21 @@ function ChannelsTable() {
</Box>
</Box>
</Table.Cell>
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{usersCount}
</Table.Cell>
{mediaQuery && (
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{formatDate(ts)}
</Table.Cell>
)}
{mediaQuery && (
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{lastMessage && formatDate(lastMessage.ts)}
</Table.Cell>
)}
{mediaQuery && (
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{belongsTo}
</Table.Cell>
)}

@ -110,7 +110,7 @@ function TeamsTable() {
<Box grow={1} mi='x8' style={style}>
<Box display='flex' alignItems='center'>
<Icon name={roomTypes.getIcon(team)} color='hint' />{' '}
<Box fontScale='p2' mi='x4'>
<Box fontScale='p4' mi='x4'>
{fname || name}
</Box>
<RoomTags room={team} style={style} />
@ -118,7 +118,7 @@ function TeamsTable() {
{topic && (
<MarkdownText
variant='inlineWithoutBreaks'
fontScale='p1'
fontScale='p3'
color='hint'
style={style}
content={topic}
@ -127,11 +127,11 @@ function TeamsTable() {
</Box>
</Box>
</Table.Cell>
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{roomsCount}
</Table.Cell>
{mediaQuery && (
<Table.Cell fontScale='p1' color='hint' style={style}>
<Table.Cell fontScale='p3' color='hint' style={style}>
{formatDate(ts)}
</Table.Cell>
)}

@ -123,16 +123,16 @@ function UserTable({ workspace = 'local' }) {
</Flex.Item>
<Box withTruncatedText grow={1} mi='x8'>
<Box display='flex'>
<Box fontScale='p2' withTruncatedText>
<Box fontScale='p4' withTruncatedText>
{name || username}
{nickname && ` (${nickname})`}
</Box>{' '}
<Box mi='x4' />{' '}
<Box fontScale='p1' color='hint' withTruncatedText>
<Box fontScale='p3' color='hint' withTruncatedText>
{username}
</Box>
</Box>
<MarkdownText variant='inline' fontScale='p1' color='hint' content={bio} />
<MarkdownText variant='inline' fontScale='p3' color='hint' content={bio} />
</Box>
</Box>
</Flex.Container>
@ -142,7 +142,7 @@ function UserTable({ workspace = 'local' }) {
)}
{federation && <Table.Cell withTruncatedText>{domain}</Table.Cell>}
{mediaQuery && (
<Table.Cell fontScale='p1' color='hint' withTruncatedText>
<Table.Cell fontScale='p3' color='hint' withTruncatedText>
{formatDate(createdAt)}
</Table.Cell>
)}

@ -12,7 +12,7 @@ const MapViewFallback: FC<MapViewFallbackProps> = ({ linkUrl }) => {
const t = useTranslation();
return (
<Box is='span' fontScale='p1' display='inline-flex' alignItems='center' paddingBlock={4}>
<Box is='span' fontScale='p3' display='inline-flex' alignItems='center' paddingBlock={4}>
<Icon name='map-pin' size={20} color='hint' />
<ExternalLink to={linkUrl}>{t('Shared_Location')}</ExternalLink>
</Box>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save