From 76a4380c1fc61754d3a2a257f2c542b18172c129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?= <60678893+juliajforesti@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:39:24 -0300 Subject: [PATCH] Chore: Replace new typography (#23756) Co-authored-by: Guilherme Gazzo --- app/theme/client/imports/general/base_old.css | 2 +- client/components/Card/Title.tsx | 2 +- client/components/GenericModal.tsx | 2 +- .../components/GenericTable/GenericTable.tsx | 2 +- client/components/GenericTable/NoResults.tsx | 4 +- client/components/Header/Subtitle.tsx | 2 +- client/components/Header/Title.tsx | 2 +- .../Attachments/Attachment/AuthorName.tsx | 2 +- .../Attachments/Attachment/Details.tsx | 2 +- .../Message/Attachments/Attachment/Text.tsx | 2 +- .../Attachments/FieldsAttachment/Field.tsx | 2 +- .../Message/Attachments/components/Load.tsx | 2 +- .../Message/Attachments/components/Retry.tsx | 2 +- client/components/NotAuthorizedPage.tsx | 2 +- .../Omnichannel/modals/CloseChatModal.js | 2 +- .../Omnichannel/modals/ForwardChatModal.js | 2 +- .../modals/ReturnChatQueueModal.tsx | 2 +- .../Omnichannel/modals/TranscriptModal.tsx | 2 +- client/components/Page/PageHeader.tsx | 2 +- client/components/PageSkeleton.tsx | 2 +- client/components/RoomForeword.js | 2 +- client/components/Sidebar/Header.js | 2 +- client/components/Sidebar/NavigationItem.js | 2 +- client/components/SortList/GroupingList.js | 2 +- client/components/SortList/SortListItem.js | 2 +- client/components/SortList/SortModeList.js | 2 +- client/components/SortList/ViewModeList.js | 2 +- client/components/Subtitle.js | 2 +- client/components/TextCopy.js | 2 +- client/components/UserCard/Info.js | 2 +- client/components/UserCard/UserCard.js | 2 +- client/components/UserCard/Username.js | 2 +- .../VerticalBar/VerticalBarHeader.tsx | 2 +- .../UserAvatarEditor/UserAvatarEditor.js | 2 +- client/components/data/Counter.js | 6 +- client/components/data/Growth.stories.js | 2 +- client/sidebar/header/EditStatusModal.tsx | 2 +- client/sidebar/header/UserDropdown.js | 2 +- .../header/actions/CreateRoomListItem.js | 2 +- client/views/InfoPanel/Label.tsx | 2 +- client/views/InfoPanel/Text.tsx | 2 +- client/views/InfoPanel/Title.tsx | 2 +- .../views/account/preferences/MyDataModal.tsx | 2 +- .../account/security/BackupCodesModal.tsx | 2 +- client/views/account/security/EndToEnd.js | 4 +- .../views/account/security/TwoFactorEmail.js | 2 +- .../views/account/security/TwoFactorTOTP.js | 4 +- .../views/account/tokens/AccountTokensRow.tsx | 2 +- client/views/account/tokens/InfoModal.tsx | 2 +- client/views/admin/apps/APIsDisplay.tsx | 4 +- .../admin/apps/AppDetailsPageContent.tsx | 18 ++-- client/views/admin/apps/AppLogsPage.js | 2 +- .../admin/apps/AppPermissionsReviewModal.js | 4 +- client/views/admin/apps/AppRow.tsx | 4 +- client/views/admin/apps/AppUpdateModal.tsx | 2 +- client/views/admin/apps/AppsWhatIsIt.js | 2 +- client/views/admin/apps/CloudLoginModal.js | 2 +- client/views/admin/apps/MarketplaceRow.tsx | 4 +- client/views/admin/apps/SettingsDisplay.tsx | 2 +- client/views/admin/apps/WarningModal.js | 2 +- client/views/admin/cloud/CopyStep.tsx | 2 +- client/views/admin/cloud/PasteStep.tsx | 2 +- client/views/admin/customEmoji/CustomEmoji.js | 65 +++++++++++ .../customEmoji/EditCustomEmojiWithData.tsx | 2 +- .../views/admin/customSounds/AdminSounds.js | 2 +- .../admin/customSounds/EditCustomSound.js | 2 +- .../customUserStatus/CustomUserStatus.js | 4 +- .../EditCustomUserStatusWithData.tsx | 2 +- .../views/admin/emailInbox/SendTestButton.js | 2 +- .../views/admin/import/ImportProgressPage.js | 4 +- .../views/admin/import/PrepareImportPage.js | 4 +- .../views/admin/info/DescriptionListEntry.js | 2 +- .../components/FederationModal/DNSText.tsx | 2 +- .../FederationModal/FederationModal.tsx | 2 +- .../FederationModal/InviteUsers.tsx | 2 +- .../views/admin/info/OfflineLicenseModal.js | 2 +- client/views/admin/info/UsagePieGraph.tsx | 2 +- .../admin/integrations/IncomingWebhookForm.js | 2 +- .../admin/integrations/IntegrationRow.js | 2 +- .../integrations/OutgoiongWebhookForm.js | 2 +- client/views/admin/integrations/new/NewBot.js | 2 +- .../views/admin/integrations/new/NewZapier.js | 2 +- client/views/admin/invites/InviteRow.js | 2 +- .../admin/oauthApps/EditOauthAppWithData.js | 2 +- .../views/admin/oauthApps/OAuthAppsTable.js | 2 +- client/views/admin/permissions/UserRow.js | 4 +- client/views/admin/rooms/EditRoom.js | 2 +- client/views/admin/rooms/RoomsTable.js | 6 +- client/views/admin/settings/GroupPage.js | 2 +- .../views/admin/settings/GroupPageSkeleton.js | 2 +- client/views/admin/settings/Section.js | 2 +- .../views/admin/settings/SectionSkeleton.js | 2 +- .../admin/sidebar/AdminSidebarSettings.tsx | 2 +- client/views/admin/users/InviteUsers.js | 4 +- client/views/admin/users/UserForm.js | 2 +- client/views/admin/users/UserRow.js | 8 +- client/views/directory/ChannelsTable.js | 12 +-- client/views/directory/TeamsTable.js | 8 +- client/views/directory/UserTable.js | 8 +- client/views/location/MapViewFallback.tsx | 2 +- client/views/notFound/NotFoundPage.js | 6 +- .../views/omnichannel/agents/AgentsRoute.js | 6 +- .../omnichannel/agents/RemoveAgentButton.js | 2 +- client/views/omnichannel/components/Label.js | 2 +- .../views/omnichannel/currentChats/Label.tsx | 2 +- .../currentChats/RemoveChatButton.tsx | 2 +- .../customFields/RemoveCustomFieldButton.js | 2 +- .../views/omnichannel/departments/AgentRow.js | 10 +- .../departments/RemoveDepartmentButton.js | 2 +- .../omnichannel/facebook/FacebookPage.tsx | 2 +- .../views/omnichannel/installation/Wrapper.js | 2 +- .../omnichannel/managers/ManagersRoute.js | 6 +- .../managers/RemoveManagerButton.js | 2 +- .../realTimeMonitoring/counter/CounterItem.js | 4 +- .../Announcement/AnnouncementComponent.tsx | 2 +- .../room/contextualBar/Call/BBB/CallBBB.tsx | 4 +- .../contextualBar/Call/Jitsi/CallJitsi.js | 4 +- .../Call/Jitsi/components/CallModal.js | 2 +- .../KeyboardShortcuts/ShortcutSection.js | 4 +- .../components/NotificationByDevice.js | 2 +- client/views/room/contextualBar/OTR/OTR.js | 6 +- .../RoomFiles/components/FileItem.js | 4 +- .../RoomMembers/List/RoomMembers.js | 4 +- client/views/room/hooks/useUserInfoActions.js | 2 +- .../modals/FileUploadModal/GenericPreview.tsx | 2 +- client/views/setupWizard/SideBar.js | 6 +- client/views/setupWizard/StepHeader.js | 2 +- client/views/setupWizard/steps/FinalStep.js | 4 +- .../setupWizard/steps/RegisterServerStep.js | 2 +- .../ModalSteps/FirstStep.tsx | 4 +- .../RemoveUsersModal/RemoveUsersFirstStep.js | 2 +- .../modals/PlaceChatOnHoldModal.tsx | 2 +- ee/client/audit/UserRow.js | 8 +- .../omnichannel/RemoveBusinessHourButton.js | 2 +- .../cannedResponses/CannedResponseEdit.tsx | 2 +- .../cannedResponses/CannedResponsesRoute.tsx | 2 +- .../RemoveCannedResponseButton.tsx | 2 +- .../InsertPlaceholderDropdown.tsx | 10 +- .../CreateCannedResponseModal.tsx | 2 +- .../CannedResponse/CannedResponse.tsx | 8 +- .../contextualBar/CannedResponse/Item.tsx | 4 +- .../priorities/RemovePriorityButton.js | 2 +- ee/client/omnichannel/tags/RemoveTagButton.js | 2 +- .../omnichannel/units/RemoveUnitButton.js | 2 +- .../admin/engagementDashboard/Section.tsx | 2 +- ee/client/views/admin/info/SeatsCard.tsx | 2 +- package-lock.json | 101 +++++++++++++++--- package.json | 6 +- 148 files changed, 371 insertions(+), 233 deletions(-) create mode 100644 client/views/admin/customEmoji/CustomEmoji.js diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css index 4378dc27b44..339396f3e71 100644 --- a/app/theme/client/imports/general/base_old.css +++ b/app/theme/client/imports/general/base_old.css @@ -1894,7 +1894,7 @@ font-family: inherit; font-size: 0.875rem; - font-weight: 600; + font-weight: 700; line-height: inherit; } diff --git a/client/components/Card/Title.tsx b/client/components/Card/Title.tsx index 5f547f649d3..a4bb2db6060 100644 --- a/client/components/Card/Title.tsx +++ b/client/components/Card/Title.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import React, { FC } from 'react'; const Title: FC = ({ children }) => ( - + {children} ); diff --git a/client/components/GenericModal.tsx b/client/components/GenericModal.tsx index a2ca56fe05c..f9f2508fcf4 100644 --- a/client/components/GenericModal.tsx +++ b/client/components/GenericModal.tsx @@ -75,7 +75,7 @@ const GenericModal: FC = ({ {title ?? t('Are_you_sure')} - {children} + {children} {dontAskAgain} diff --git a/client/components/GenericTable/GenericTable.tsx b/client/components/GenericTable/GenericTable.tsx index c6e5317d24e..a7070a5094f 100644 --- a/client/components/GenericTable/GenericTable.tsx +++ b/client/components/GenericTable/GenericTable.tsx @@ -88,7 +88,7 @@ const GenericTable = forwardRef(function GenericTable< ? renderFilter({ ...props, onChange: setFilter } as any) // TODO: ugh : null} {results && !results.length ? ( - + {t('No_data_found')} ) : ( diff --git a/client/components/GenericTable/NoResults.tsx b/client/components/GenericTable/NoResults.tsx index 00291af32a1..7260f34f33a 100644 --- a/client/components/GenericTable/NoResults.tsx +++ b/client/components/GenericTable/NoResults.tsx @@ -25,10 +25,10 @@ const NoResults: FC = ({ icon, title, description, buttonTitle, > - + {title} - + {description} diff --git a/client/components/Header/Subtitle.tsx b/client/components/Header/Subtitle.tsx index 95b8365c386..3b7cf9abcca 100644 --- a/client/components/Header/Subtitle.tsx +++ b/client/components/Header/Subtitle.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import React, { FC } from 'react'; const Subtitle: FC = (props) => ( - + ); export default Subtitle; diff --git a/client/components/Header/Title.tsx b/client/components/Header/Title.tsx index a7797beeaad..79775233d04 100644 --- a/client/components/Header/Title.tsx +++ b/client/components/Header/Title.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import React, { FC } from 'react'; const Title: FC = (props) => ( - + ); export default Title; diff --git a/client/components/Message/Attachments/Attachment/AuthorName.tsx b/client/components/Message/Attachments/Attachment/AuthorName.tsx index 143caf1748a..5790dcf0400 100644 --- a/client/components/Message/Attachments/Attachment/AuthorName.tsx +++ b/client/components/Message/Attachments/Attachment/AuthorName.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import React, { ComponentProps, FC } from 'react'; const AuthorName: FC> = (props) => ( - + ); export default AuthorName; diff --git a/client/components/Message/Attachments/Attachment/Details.tsx b/client/components/Message/Attachments/Attachment/Details.tsx index d1961d5d2cf..2cdcf2b3e19 100644 --- a/client/components/Message/Attachments/Attachment/Details.tsx +++ b/client/components/Message/Attachments/Attachment/Details.tsx @@ -4,7 +4,7 @@ import React, { FC, ComponentProps } from 'react'; const Details: FC> = ({ ...props }) => ( > = (props) => ( - + ); export default Text; diff --git a/client/components/Message/Attachments/FieldsAttachment/Field.tsx b/client/components/Message/Attachments/FieldsAttachment/Field.tsx index 6ed0bcea845..635151e2e82 100644 --- a/client/components/Message/Attachments/FieldsAttachment/Field.tsx +++ b/client/components/Message/Attachments/FieldsAttachment/Field.tsx @@ -9,7 +9,7 @@ type FieldProps = { const Field: FC = ({ title, value, ...props }) => ( - + {title} {value} diff --git a/client/components/Message/Attachments/components/Load.tsx b/client/components/Message/Attachments/components/Load.tsx index aaf66518292..5a901efb99b 100644 --- a/client/components/Message/Attachments/components/Load.tsx +++ b/client/components/Message/Attachments/components/Load.tsx @@ -22,7 +22,7 @@ const Load: FC = ({ load, ...props }) => { return ( - + {t('Click_to_load')} diff --git a/client/components/Message/Attachments/components/Retry.tsx b/client/components/Message/Attachments/components/Retry.tsx index 341ae63f0b0..3f635129534 100644 --- a/client/components/Message/Attachments/components/Retry.tsx +++ b/client/components/Message/Attachments/components/Retry.tsx @@ -22,7 +22,7 @@ const Retry: FC = ({ retry }) => { return ( - + {t('Retry')} diff --git a/client/components/NotAuthorizedPage.tsx b/client/components/NotAuthorizedPage.tsx index aad02ca26c6..7de9cb34808 100644 --- a/client/components/NotAuthorizedPage.tsx +++ b/client/components/NotAuthorizedPage.tsx @@ -10,7 +10,7 @@ const NotAuthorizedPage = (): ReactElement => { return ( - + {t('You_are_not_authorized_to_view_this_page')} diff --git a/client/components/Omnichannel/modals/CloseChatModal.js b/client/components/Omnichannel/modals/CloseChatModal.js index 0c63646b831..a53757fce19 100644 --- a/client/components/Omnichannel/modals/CloseChatModal.js +++ b/client/components/Omnichannel/modals/CloseChatModal.js @@ -67,7 +67,7 @@ const CloseChatModal = ({ department = {}, onCancel, onConfirm }) => { {t('Closing_chat')} - + {t('Close_room_description')} {t('Comment')} diff --git a/client/components/Omnichannel/modals/ForwardChatModal.js b/client/components/Omnichannel/modals/ForwardChatModal.js index 1c8ba7048bf..0dce6f6e139 100644 --- a/client/components/Omnichannel/modals/ForwardChatModal.js +++ b/client/components/Omnichannel/modals/ForwardChatModal.js @@ -89,7 +89,7 @@ const ForwardChatModal = ({ onForward, onCancel, room, ...props }) => { {t('Forward_chat')} - + {t('Forward_to_department')} diff --git a/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx b/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx index 1489118ffe6..474f25f6c50 100644 --- a/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx +++ b/client/components/Omnichannel/modals/ReturnChatQueueModal.tsx @@ -22,7 +22,7 @@ const ReturnChatQueueModal: FC = ({ {t('Return_to_the_queue')} - {t('Would_you_like_to_return_the_queue')} + {t('Would_you_like_to_return_the_queue')} diff --git a/client/components/Omnichannel/modals/TranscriptModal.tsx b/client/components/Omnichannel/modals/TranscriptModal.tsx index 4a5fc1be54e..2d872514db1 100644 --- a/client/components/Omnichannel/modals/TranscriptModal.tsx +++ b/client/components/Omnichannel/modals/TranscriptModal.tsx @@ -76,7 +76,7 @@ const TranscriptModal: FC = ({ {t('Transcript')} - + {!!transcriptRequest &&

{t('Livechat_transcript_already_requested_warning')}

} {t('Email')}* diff --git a/client/components/Page/PageHeader.tsx b/client/components/Page/PageHeader.tsx index 64dafe06611..8158657bcc3 100644 --- a/client/components/Page/PageHeader.tsx +++ b/client/components/Page/PageHeader.tsx @@ -32,7 +32,7 @@ const PageHeader: FC = ({ children = undefined, title, ...props )} - + {title} {children} diff --git a/client/components/PageSkeleton.tsx b/client/components/PageSkeleton.tsx index 5fbef4d1f99..a7f7a0a2b22 100644 --- a/client/components/PageSkeleton.tsx +++ b/client/components/PageSkeleton.tsx @@ -13,7 +13,7 @@ const PageSkeleton = (): ReactElement => ( - + diff --git a/client/components/RoomForeword.js b/client/components/RoomForeword.js index 79784e72cbb..fac7f41d15c 100644 --- a/client/components/RoomForeword.js +++ b/client/components/RoomForeword.js @@ -45,7 +45,7 @@ const RoomForeword = ({ _id: rid }) => { - + {t('Direct_message_you_have_joined')} diff --git a/client/components/Sidebar/Header.js b/client/components/Sidebar/Header.js index 8a7a0ecc98b..80854fe21c5 100644 --- a/client/components/Sidebar/Header.js +++ b/client/components/Sidebar/Header.js @@ -13,7 +13,7 @@ const Header = ({ title, onClose, children = undefined, ...props }) => ( flexGrow={1} > {title && ( - + {title} )} diff --git a/client/components/Sidebar/NavigationItem.js b/client/components/Sidebar/NavigationItem.js index 28e7f4f2da2..eb67d3c3917 100644 --- a/client/components/Sidebar/NavigationItem.js +++ b/client/components/Sidebar/NavigationItem.js @@ -22,7 +22,7 @@ const NavigationItem = ({ return ( {icon && } - + {label}{' '} {tag && ( diff --git a/client/components/SortList/GroupingList.js b/client/components/SortList/GroupingList.js index 28eecf52dc7..5749a889914 100644 --- a/client/components/SortList/GroupingList.js +++ b/client/components/SortList/GroupingList.js @@ -28,7 +28,7 @@ function GroupingList() { return ( <> - + {t('Group_by')} diff --git a/client/components/SortList/SortListItem.js b/client/components/SortList/SortListItem.js index e7b980491fb..99ae40572c8 100644 --- a/client/components/SortList/SortListItem.js +++ b/client/components/SortList/SortListItem.js @@ -14,7 +14,7 @@ function SortListItem({ text, icon, input }) { - + {text} diff --git a/client/components/SortList/SortModeList.js b/client/components/SortList/SortModeList.js index 69680228c41..0f9521b8fcb 100644 --- a/client/components/SortList/SortModeList.js +++ b/client/components/SortList/SortModeList.js @@ -24,7 +24,7 @@ function SortModeList() { return ( <> - + {t('Sort_By')} diff --git a/client/components/SortList/ViewModeList.js b/client/components/SortList/ViewModeList.js index 8bc1735f1a0..9d9cfd72a0e 100644 --- a/client/components/SortList/ViewModeList.js +++ b/client/components/SortList/ViewModeList.js @@ -33,7 +33,7 @@ function ViewModeList() { return ( <> - + {t('Display')} diff --git a/client/components/Subtitle.js b/client/components/Subtitle.js index eaace9306f7..aa69bd45a78 100644 --- a/client/components/Subtitle.js +++ b/client/components/Subtitle.js @@ -6,7 +6,7 @@ function Subtitle(props) { ( ( - + ); export default Info; diff --git a/client/components/UserCard/UserCard.js b/client/components/UserCard/UserCard.js index 59c6da1b380..dbb1779d557 100644 --- a/client/components/UserCard/UserCard.js +++ b/client/components/UserCard/UserCard.js @@ -63,7 +63,7 @@ const UserCard = forwardRef(function UserCard( {nickname && ( - + ({nickname}) )} diff --git a/client/components/UserCard/Username.js b/client/components/UserCard/Username.js index 5e7fa18e073..90792452e99 100644 --- a/client/components/UserCard/Username.js +++ b/client/components/UserCard/Username.js @@ -10,7 +10,7 @@ const Username = ({ name, status = , title, ...props }) => title={title} flexShrink={0} alignItems='center' - fontScale='s2' + fontScale='h4' color='default' withTruncatedText > diff --git a/client/components/VerticalBar/VerticalBarHeader.tsx b/client/components/VerticalBar/VerticalBarHeader.tsx index 4f53dbeec16..ece29f07c0f 100644 --- a/client/components/VerticalBar/VerticalBarHeader.tsx +++ b/client/components/VerticalBar/VerticalBarHeader.tsx @@ -21,7 +21,7 @@ const VerticalBarHeader: FC<{ children: ReactNode; props?: ComponentProps + {t('Profile_picture')} {count} - {variation} + {variation} - + {description} diff --git a/client/components/data/Growth.stories.js b/client/components/data/Growth.stories.js index eb7c9a4cae6..26fea94a248 100644 --- a/client/components/data/Growth.stories.js +++ b/client/components/data/Growth.stories.js @@ -16,7 +16,7 @@ export const Zero = () => {0}; export const Negative = () => {-3}; export const WithTextStyle = () => - ['h1', 's1', 'c1', 'micro'].map((fontScale) => ( + ['h2', 's1', 'c1', 'micro'].map((fontScale) => ( {3} {-3} diff --git a/client/sidebar/header/EditStatusModal.tsx b/client/sidebar/header/EditStatusModal.tsx index d16eab0f969..981114746ac 100644 --- a/client/sidebar/header/EditStatusModal.tsx +++ b/client/sidebar/header/EditStatusModal.tsx @@ -68,7 +68,7 @@ const EditStatusModal = ({ {t('Edit_Status')} - + {t('StatusMessage')} diff --git a/client/sidebar/header/UserDropdown.js b/client/sidebar/header/UserDropdown.js index f98aef08444..9ce7f5ce877 100644 --- a/client/sidebar/header/UserDropdown.js +++ b/client/sidebar/header/UserDropdown.js @@ -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} diff --git a/client/sidebar/header/actions/CreateRoomListItem.js b/client/sidebar/header/actions/CreateRoomListItem.js index 23ebf864e5d..8c42f2d3aff 100644 --- a/client/sidebar/header/actions/CreateRoomListItem.js +++ b/client/sidebar/header/actions/CreateRoomListItem.js @@ -14,7 +14,7 @@ export default function CreateRoomListItem({ text, icon, action }) { - + {text} diff --git a/client/views/InfoPanel/Label.tsx b/client/views/InfoPanel/Label.tsx index ec0d6cf4e34..7d6402fcc24 100644 --- a/client/views/InfoPanel/Label.tsx +++ b/client/views/InfoPanel/Label.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import React, { ComponentProps, FC } from 'react'; const Label: FC> = (props) => ( - + ); export default Label; diff --git a/client/views/InfoPanel/Text.tsx b/client/views/InfoPanel/Text.tsx index efd146d8802..1aafff9971d 100644 --- a/client/views/InfoPanel/Text.tsx +++ b/client/views/InfoPanel/Text.tsx @@ -7,7 +7,7 @@ const wordBreak = css` `; const Text: FC> = (props) => ( - + ); export default Text; diff --git a/client/views/InfoPanel/Title.tsx b/client/views/InfoPanel/Title.tsx index 8fdfa8966bc..67fb15f44fa 100644 --- a/client/views/InfoPanel/Title.tsx +++ b/client/views/InfoPanel/Title.tsx @@ -12,7 +12,7 @@ const Title: FC = ({ title, icon }) => ( title={title} flexShrink={0} alignItems='center' - fontScale='s2' + fontScale='h4' color='default' withTruncatedText > diff --git a/client/views/account/preferences/MyDataModal.tsx b/client/views/account/preferences/MyDataModal.tsx index 5c6bf956f4a..ab4cd905b36 100644 --- a/client/views/account/preferences/MyDataModal.tsx +++ b/client/views/account/preferences/MyDataModal.tsx @@ -19,7 +19,7 @@ const MyDataModal: FC = ({ onCancel, title, text, ...props }) {title} - + {text} diff --git a/client/views/account/security/BackupCodesModal.tsx b/client/views/account/security/BackupCodesModal.tsx index c79c2f0c9ec..30d532c0db3 100644 --- a/client/views/account/security/BackupCodesModal.tsx +++ b/client/views/account/security/BackupCodesModal.tsx @@ -21,7 +21,7 @@ const BackupCodesModal: FC = ({ codes, onClose, ...props {t('Backup_codes')} - + {t('Make_sure_you_have_a_copy_of_your_codes_1')} diff --git a/client/views/account/security/EndToEnd.js b/client/views/account/security/EndToEnd.js index e7d1121dd7c..555fda99ff6 100644 --- a/client/views/account/security/EndToEnd.js +++ b/client/views/account/security/EndToEnd.js @@ -75,7 +75,7 @@ const EndToEnd = (props) => { return ( - {t('E2E_Encryption_Password_Change')} + {t('E2E_Encryption_Password_Change')} @@ -106,7 +106,7 @@ const EndToEnd = (props) => { - + {t('Reset_E2E_Key')} diff --git a/client/views/account/security/TwoFactorEmail.js b/client/views/account/security/TwoFactorEmail.js index 10087ec7b71..0c0d3476426 100644 --- a/client/views/account/security/TwoFactorEmail.js +++ b/client/views/account/security/TwoFactorEmail.js @@ -35,7 +35,7 @@ const TwoFactorEmail = (props) => { return ( - {t('Two-factor_authentication_email')} + {t('Two-factor_authentication_email')} {isEnabled && ( - + {t('Backup_codes')} {t('You_have_n_codes_remaining', { number: codesRemaining })} diff --git a/client/views/account/tokens/AccountTokensRow.tsx b/client/views/account/tokens/AccountTokensRow.tsx index 3456beb3d3b..c83157d27ec 100644 --- a/client/views/account/tokens/AccountTokensRow.tsx +++ b/client/views/account/tokens/AccountTokensRow.tsx @@ -30,7 +30,7 @@ const AccountTokensRow: FC = ({ return ( - + {name} {isMedium && {formatDateAndTime(createdAt)}} diff --git a/client/views/account/tokens/InfoModal.tsx b/client/views/account/tokens/InfoModal.tsx index fb6b2a3498e..c28615ad35f 100644 --- a/client/views/account/tokens/InfoModal.tsx +++ b/client/views/account/tokens/InfoModal.tsx @@ -27,7 +27,7 @@ const InfoModal: FC = ({ {title} - {content} + {content} {cancelText && } diff --git a/client/views/admin/apps/APIsDisplay.tsx b/client/views/admin/apps/APIsDisplay.tsx index 497265d7be4..ec895c7948d 100644 --- a/client/views/admin/apps/APIsDisplay.tsx +++ b/client/views/admin/apps/APIsDisplay.tsx @@ -25,12 +25,12 @@ const APIsDisplay: FC = ({ apis }) => { <> - + {t('APIs')} {apis.map((api) => ( - + {api.methods.join(' | ').toUpperCase()} {api.path} {api.methods.map((method) => ( diff --git a/client/views/admin/apps/AppDetailsPageContent.tsx b/client/views/admin/apps/AppDetailsPageContent.tsx index 1fd8d884d26..5c3810a56a2 100644 --- a/client/views/admin/apps/AppDetailsPageContent.tsx +++ b/client/views/admin/apps/AppDetailsPageContent.tsx @@ -42,9 +42,9 @@ const AppDetailsPageContent: FC = ({ data }) => { iconFileData={iconFileData} /> - {name} + {name} - + {t('By_author', { author: authorName })} |{t('Version_version', { version })} @@ -97,7 +97,7 @@ const AppDetailsPageContent: FC = ({ data }) => { - {t('Categories')} + {t('Categories')} {categories && categories.map((current) => ( @@ -107,7 +107,7 @@ const AppDetailsPageContent: FC = ({ data }) => { ))} - {t('Contact')} + {t('Contact')} = ({ data }) => { flexWrap='wrap' > - + {t('Author_Site')} - + {t('Support')} - {t('Details')} + {t('Details')} {description} @@ -140,7 +140,7 @@ const AppDetailsPageContent: FC = ({ data }) => { - {t('Bundles')} + {t('Bundles')} {bundledIn.map((bundle) => ( = ({ data }) => { ))} - {bundle.bundleName} + {bundle.bundleName} {bundle.apps.map((app) => ( {app.latest.name}, ))} diff --git a/client/views/admin/apps/AppLogsPage.js b/client/views/admin/apps/AppLogsPage.js index 00d13354435..1e6d9a8bc2d 100644 --- a/client/views/admin/apps/AppLogsPage.js +++ b/client/views/admin/apps/AppLogsPage.js @@ -81,7 +81,7 @@ function AppLogsPage({ id, ...props }) { {loading && } {app.error && ( - + {app.error.message} )} diff --git a/client/views/admin/apps/AppPermissionsReviewModal.js b/client/views/admin/apps/AppPermissionsReviewModal.js index e16ed7d4109..43eee0b80f2 100644 --- a/client/views/admin/apps/AppPermissionsReviewModal.js +++ b/client/views/admin/apps/AppPermissionsReviewModal.js @@ -25,10 +25,10 @@ const AppPermissionsReviewModal = ({ appPermissions, cancel, confirm, modalProps {t('Apps_Permissions_Review_Modal_Title')} - + {t('Apps_Permissions_Review_Modal_Subtitle')} - +
    {appPermissions.length ? appPermissions.map((permission, count) => ( diff --git a/client/views/admin/apps/AppRow.tsx b/client/views/admin/apps/AppRow.tsx index 762257cb5c8..b20e01afab4 100644 --- a/client/views/admin/apps/AppRow.tsx +++ b/client/views/admin/apps/AppRow.tsx @@ -74,10 +74,10 @@ const AppRow: FC = ({ medium, ...props }) => { iconFileData={iconFileData} /> - + {name} - {`${t('By')} ${authorName}`} + {`${t('By')} ${authorName}`} {medium && ( diff --git a/client/views/admin/apps/AppUpdateModal.tsx b/client/views/admin/apps/AppUpdateModal.tsx index 88ebcadc3e3..cdaf6ddb9f5 100644 --- a/client/views/admin/apps/AppUpdateModal.tsx +++ b/client/views/admin/apps/AppUpdateModal.tsx @@ -30,7 +30,7 @@ const AppUpdateModal: FC = ({ confirm, cancel, ...props }) {t('Apps_Manual_Update_Modal_Title')} - {t('Apps_Manual_Update_Modal_Body')} + {t('Apps_Manual_Update_Modal_Body')} diff --git a/client/views/omnichannel/components/Label.js b/client/views/omnichannel/components/Label.js index 80c1fb2353b..400e523419f 100644 --- a/client/views/omnichannel/components/Label.js +++ b/client/views/omnichannel/components/Label.js @@ -1,6 +1,6 @@ import { Box } from '@rocket.chat/fuselage'; import React from 'react'; -const Label = (props) => ; +const Label = (props) => ; export default Label; diff --git a/client/views/omnichannel/currentChats/Label.tsx b/client/views/omnichannel/currentChats/Label.tsx index 27bbf61dab1..f4259e297b5 100644 --- a/client/views/omnichannel/currentChats/Label.tsx +++ b/client/views/omnichannel/currentChats/Label.tsx @@ -2,7 +2,7 @@ import { Box } from '@rocket.chat/fuselage'; import React, { ComponentProps, FC } from 'react'; const Label: FC> = (props) => ( - + ); export default Label; diff --git a/client/views/omnichannel/currentChats/RemoveChatButton.tsx b/client/views/omnichannel/currentChats/RemoveChatButton.tsx index 34aca32b83c..f8eaa765672 100644 --- a/client/views/omnichannel/currentChats/RemoveChatButton.tsx +++ b/client/views/omnichannel/currentChats/RemoveChatButton.tsx @@ -51,7 +51,7 @@ const RemoveChatButton: FC<{ _id: string; reload: () => void }> = ({ _id, reload }); return ( - + diff --git a/client/views/omnichannel/customFields/RemoveCustomFieldButton.js b/client/views/omnichannel/customFields/RemoveCustomFieldButton.js index 911ae1c1782..7921e89ddf4 100644 --- a/client/views/omnichannel/customFields/RemoveCustomFieldButton.js +++ b/client/views/omnichannel/customFields/RemoveCustomFieldButton.js @@ -46,7 +46,7 @@ function RemoveCustomFieldButton({ _id, reload }) { }); return ( - + diff --git a/client/views/omnichannel/departments/AgentRow.js b/client/views/omnichannel/departments/AgentRow.js index d636b775a13..527a280627f 100644 --- a/client/views/omnichannel/departments/AgentRow.js +++ b/client/views/omnichannel/departments/AgentRow.js @@ -18,11 +18,11 @@ const AgentRow = ({ agentId, username, name, avatarETag, mediaQuery, agentList, /> - + {name || username} {!mediaQuery && name && ( - + {' '} {`@${username}`}{' '} @@ -31,13 +31,13 @@ const AgentRow = ({ agentId, username, name, avatarETag, mediaQuery, agentList, - + - + - + diff --git a/client/views/omnichannel/departments/RemoveDepartmentButton.js b/client/views/omnichannel/departments/RemoveDepartmentButton.js index 10b170e6def..e7aee9c6dae 100644 --- a/client/views/omnichannel/departments/RemoveDepartmentButton.js +++ b/client/views/omnichannel/departments/RemoveDepartmentButton.js @@ -44,7 +44,7 @@ function RemoveDepartmentButton({ _id, reload }) { }); return ( - + diff --git a/client/views/omnichannel/facebook/FacebookPage.tsx b/client/views/omnichannel/facebook/FacebookPage.tsx index 694ea1e5ce0..01821cbeea4 100644 --- a/client/views/omnichannel/facebook/FacebookPage.tsx +++ b/client/views/omnichannel/facebook/FacebookPage.tsx @@ -57,7 +57,7 @@ const FacebookPage: FC = ({ )} {enabled && ( <> - + {t('Pages')} {pages?.length ? ( diff --git a/client/views/omnichannel/installation/Wrapper.js b/client/views/omnichannel/installation/Wrapper.js index 2894098e5a5..ac763f686b3 100644 --- a/client/views/omnichannel/installation/Wrapper.js +++ b/client/views/omnichannel/installation/Wrapper.js @@ -5,7 +5,7 @@ const Wrapper = (text) => ( - + {name || username} {!mediaQuery && name && ( - + {' '} {`@${username}`}{' '} @@ -120,7 +120,7 @@ function ManagersRoute() { {mediaQuery && ( - + {username} {' '} diff --git a/client/views/omnichannel/managers/RemoveManagerButton.js b/client/views/omnichannel/managers/RemoveManagerButton.js index 1509b6bfa03..6e8f3532a5a 100644 --- a/client/views/omnichannel/managers/RemoveManagerButton.js +++ b/client/views/omnichannel/managers/RemoveManagerButton.js @@ -43,7 +43,7 @@ function RemoveManagerButton({ _id, reload }) { }); return ( - + diff --git a/client/views/omnichannel/realTimeMonitoring/counter/CounterItem.js b/client/views/omnichannel/realTimeMonitoring/counter/CounterItem.js index bd6a28fd2df..9cfb00c23b3 100644 --- a/client/views/omnichannel/realTimeMonitoring/counter/CounterItem.js +++ b/client/views/omnichannel/realTimeMonitoring/counter/CounterItem.js @@ -10,10 +10,10 @@ const CounterItem = ({ title = '', count = '-', ...props }) => ( flexGrow={1} {...props} > - + {title} - {count} + {count} ); diff --git a/client/views/room/Announcement/AnnouncementComponent.tsx b/client/views/room/Announcement/AnnouncementComponent.tsx index c5eb385aed4..2b6db62b54b 100644 --- a/client/views/room/Announcement/AnnouncementComponent.tsx +++ b/client/views/room/Announcement/AnnouncementComponent.tsx @@ -39,7 +39,7 @@ const AnnouncementComponent: FC = ({ children, onCl pi='x24' alignItems='center' display='flex' - fontScale='p2' + fontScale='p4' textAlign='center' className={announcementBar} > diff --git a/client/views/room/contextualBar/Call/BBB/CallBBB.tsx b/client/views/room/contextualBar/Call/BBB/CallBBB.tsx index d2ac6124f19..7503f88341a 100644 --- a/client/views/room/contextualBar/Call/BBB/CallBBB.tsx +++ b/client/views/room/contextualBar/Call/BBB/CallBBB.tsx @@ -33,8 +33,8 @@ const CallBBB: FC = ({ {openNewWindow ? ( <> - {t('Video_Conference')} - + {t('Video_Conference')} + {t('Opened_in_a_new_window')} diff --git a/client/views/room/contextualBar/Call/Jitsi/CallJitsi.js b/client/views/room/contextualBar/Call/Jitsi/CallJitsi.js index 536c7afe9b9..ee6c6eedc5e 100644 --- a/client/views/room/contextualBar/Call/Jitsi/CallJitsi.js +++ b/client/views/room/contextualBar/Call/Jitsi/CallJitsi.js @@ -9,8 +9,8 @@ const CallJitsi = ({ handleClose, openNewWindow, refContent, children }) => { const content = openNewWindow ? ( <> - {t('Video_Conference')} - + {t('Video_Conference')} + {t('Opened_in_a_new_window')} diff --git a/client/views/room/contextualBar/Call/Jitsi/components/CallModal.js b/client/views/room/contextualBar/Call/Jitsi/components/CallModal.js index 4ecea195088..07546dd0c7a 100644 --- a/client/views/room/contextualBar/Call/Jitsi/components/CallModal.js +++ b/client/views/room/contextualBar/Call/Jitsi/components/CallModal.js @@ -14,7 +14,7 @@ export const CallModal = ({ handleYes, handleCancel }) => { - {t('Start_video_call')} + {t('Start_video_call')} diff --git a/client/views/room/contextualBar/KeyboardShortcuts/ShortcutSection.js b/client/views/room/contextualBar/KeyboardShortcuts/ShortcutSection.js index 3a0858fbb8b..7f2082ab5f5 100644 --- a/client/views/room/contextualBar/KeyboardShortcuts/ShortcutSection.js +++ b/client/views/room/contextualBar/KeyboardShortcuts/ShortcutSection.js @@ -3,11 +3,11 @@ import React from 'react'; const ShortcutSection = ({ title, command }) => ( - + {title} - {command} + {command} ); diff --git a/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.js b/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.js index 871eb9b898c..e0107b46309 100644 --- a/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.js +++ b/client/views/room/contextualBar/NotificationPreferences/components/NotificationByDevice.js @@ -6,7 +6,7 @@ export const NotificationByDevice = ({ device, icon, children }) => ( title={ - + {device} diff --git a/client/views/room/contextualBar/OTR/OTR.js b/client/views/room/contextualBar/OTR/OTR.js index d20e8a1b9e4..2fd7cc4e1d0 100644 --- a/client/views/room/contextualBar/OTR/OTR.js +++ b/client/views/room/contextualBar/OTR/OTR.js @@ -24,7 +24,7 @@ const OTR = ({ - {t('Off_the_record_conversation')} + {t('Off_the_record_conversation')} {!isEstablishing && !isEstablished && isOnline && ( diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx index 621ad8b66fd..efb6f924d3a 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx +++ b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx @@ -163,7 +163,7 @@ const CannedResponseEdit: FC<{ - + { - + {createdBy.username} diff --git a/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx b/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx index 9dd40091f01..f9de5e44130 100644 --- a/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx +++ b/ee/client/omnichannel/cannedResponses/RemoveCannedResponseButton.tsx @@ -60,7 +60,7 @@ const RemoveCannedResponseButton: FC = ({ }); return ( - + diff --git a/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx b/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx index fb6769f6432..12e14da95c2 100644 --- a/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx +++ b/ee/client/omnichannel/components/CannedResponse/MarkdownTextEditor/InsertPlaceholderDropdown.tsx @@ -41,17 +41,17 @@ const InsertPlaceholderDropdown: FC<{ setPlaceholder('contact.name')}> - + {t('Name')} setPlaceholder('contact.email')}> - + {t('Email')} setPlaceholder('contact.phone')}> - + {t('Phone')} @@ -62,12 +62,12 @@ const InsertPlaceholderDropdown: FC<{ setPlaceholder('agent.name')}> - + {t('Name')} setPlaceholder('agent.email')}> - + {t('Email')} diff --git a/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx b/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx index a035377dc3b..626b03f8297 100644 --- a/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx +++ b/ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/CreateCannedResponseModal.tsx @@ -49,7 +49,7 @@ const CreateCannedResponseModal: FC<{ }} /> - + - + {t('Shortcut')}: @@ -59,7 +59,7 @@ const CannedResponse: FC<{ - + {t('Content')}: @@ -67,7 +67,7 @@ const CannedResponse: FC<{ - + {t('Sharing')}: @@ -75,7 +75,7 @@ const CannedResponse: FC<{ - + {t('Tags')}: diff --git a/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx b/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx index ac63b3dbf3b..3c06aaac0ad 100644 --- a/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx +++ b/ee/client/omnichannel/components/contextualBar/CannedResponse/Item.tsx @@ -37,7 +37,7 @@ const Item: FC<{ > - + !{data.shortcut} @@ -57,7 +57,7 @@ const Item: FC<{ - + "{data.text}" {data.tags && data.tags.length > 0 && ( diff --git a/ee/client/omnichannel/priorities/RemovePriorityButton.js b/ee/client/omnichannel/priorities/RemovePriorityButton.js index 87850094361..a729ad1859b 100644 --- a/ee/client/omnichannel/priorities/RemovePriorityButton.js +++ b/ee/client/omnichannel/priorities/RemovePriorityButton.js @@ -49,7 +49,7 @@ function RemovePriorityButton({ _id, reload }) { }); return ( - + diff --git a/ee/client/omnichannel/tags/RemoveTagButton.js b/ee/client/omnichannel/tags/RemoveTagButton.js index f7b38b8d91c..ce229eae58c 100644 --- a/ee/client/omnichannel/tags/RemoveTagButton.js +++ b/ee/client/omnichannel/tags/RemoveTagButton.js @@ -49,7 +49,7 @@ function RemoveTagButton({ _id, reload }) { }); return ( - + diff --git a/ee/client/omnichannel/units/RemoveUnitButton.js b/ee/client/omnichannel/units/RemoveUnitButton.js index d539186ea9c..e6d364e646e 100644 --- a/ee/client/omnichannel/units/RemoveUnitButton.js +++ b/ee/client/omnichannel/units/RemoveUnitButton.js @@ -49,7 +49,7 @@ function RemoveUnitButton({ _id, reload }) { }); return ( - + diff --git a/ee/client/views/admin/engagementDashboard/Section.tsx b/ee/client/views/admin/engagementDashboard/Section.tsx index 3029fd2904f..72a37f74745 100644 --- a/ee/client/views/admin/engagementDashboard/Section.tsx +++ b/ee/client/views/admin/engagementDashboard/Section.tsx @@ -16,7 +16,7 @@ const Section = ({ {title && ( - + {title} )} diff --git a/ee/client/views/admin/info/SeatsCard.tsx b/ee/client/views/admin/info/SeatsCard.tsx index 77744483520..2ced4ceaca3 100644 --- a/ee/client/views/admin/info/SeatsCard.tsx +++ b/ee/client/views/admin/info/SeatsCard.tsx @@ -34,7 +34,7 @@ const SeatsCard = (): ReactElement | null => { display='flex' flexDirection='row' justifyContent='center' - fontScale={isNearLimit ? 'p2' : 'p1'} + fontScale={isNearLimit ? 'p4' : 'p3'} > {!seatsCap ? ( diff --git a/package-lock.json b/package-lock.json index f116739dc08..5151742de94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5363,22 +5363,67 @@ } }, "@rocket.chat/fuselage": { - "version": "0.30.1", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.30.1.tgz", - "integrity": "sha512-tO178KfR8GFRuIm/2Lv5f0mKoHS4ZSKAJB6jE5UOrGehDN4kjJ8lKcyCoF24yBKcp/3q8ZbkNTgyGY1nB+jhlQ==", - "requires": { - "@rocket.chat/css-in-js": "^0.30.0", - "@rocket.chat/css-supports": "^0.30.0", - "@rocket.chat/fuselage-tokens": "^0.30.0", - "@rocket.chat/memo": "^0.30.0", + "version": "0.6.3-dev.357", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.357.tgz", + "integrity": "sha512-8pW5NzSgn0dy+Zo+ebuXEhsJP6ByIXlH0OOr23tfIegMQQz/rULPZvK66E+PxExNv+nFQ+X/HemcmkEi1/BNbw==", + "requires": { + "@rocket.chat/css-in-js": "^0.6.3-dev.357+eda6fa37", + "@rocket.chat/css-supports": "^0.6.3-dev.357+eda6fa37", + "@rocket.chat/fuselage-tokens": "^0.6.3-dev.357+eda6fa37", + "@rocket.chat/memo": "^0.6.3-dev.357+eda6fa37", "invariant": "^2.2.4", "react-keyed-flatten-children": "^1.3.0" + }, + "dependencies": { + "@rocket.chat/css-in-js": { + "version": "0.6.3-dev.357", + "resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.357.tgz", + "integrity": "sha512-SMTb2/XtLOrMiuNnviBLfhOp00IJ+PZB1GYUh4qIN0+2j4pv9VKJ+oUgX9s1Gumzrrh3O/Y1mEGl7V02KbXyYg==", + "requires": { + "@emotion/hash": "^0.8.0", + "@rocket.chat/css-supports": "^0.6.3-dev.357+eda6fa37", + "@rocket.chat/memo": "^0.6.3-dev.357+eda6fa37", + "@rocket.chat/stylis-logical-props-middleware": "^0.6.3-dev.357+eda6fa37", + "stylis": "^4.0.10" + } + }, + "@rocket.chat/css-supports": { + "version": "0.6.3-dev.357", + "resolved": "https://registry.npmjs.org/@rocket.chat/css-supports/-/css-supports-0.6.3-dev.357.tgz", + "integrity": "sha512-SXvr/0of9EV38HCYRGs5fsFnCDmRDUBE/TUXa08btara/aiPSAVrCfrLDnZocqIoc/+8JTgZb28EyQql1Hm1TA==", + "requires": { + "@rocket.chat/memo": "^0.6.3-dev.357+eda6fa37", + "tslib": "^2.3.1" + } + }, + "@rocket.chat/memo": { + "version": "0.6.3-dev.357", + "resolved": "https://registry.npmjs.org/@rocket.chat/memo/-/memo-0.6.3-dev.357.tgz", + "integrity": "sha512-mHct/JufxozOBUylaCresEpwNR9/Ad9L3tU/avt+MzrVi4nbqr9X4tZw2Nqz7uaHfyzJQyqye1KECqX/3t2IiA==", + "requires": { + "tslib": "^2.3.1" + } + }, + "@rocket.chat/stylis-logical-props-middleware": { + "version": "0.6.3-dev.357", + "resolved": "https://registry.npmjs.org/@rocket.chat/stylis-logical-props-middleware/-/stylis-logical-props-middleware-0.6.3-dev.357.tgz", + "integrity": "sha512-RiFGdIIUKOcjTMfuC2DlJUfR0QlpyYft8awUimGqahxzX1QmWh9mzwuYo5Y0bmyrRySJU5g3KJx8OcS1pvSoOQ==", + "requires": { + "@rocket.chat/css-supports": "^0.6.3-dev.357+eda6fa37", + "tslib": "^2.3.1" + } + }, + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } } }, "@rocket.chat/fuselage-hooks": { - "version": "0.30.1", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.30.1.tgz", - "integrity": "sha512-9mfe8yx9MjgjYGDKctHqDkV5Byb5PuAXDter1sl37w/Y9gk8TB1tohU+bF88YthBYSLnqBaNWZMsO2zpKuTGiQ==" + "version": "0.6.3-dev.358", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.3-dev.358.tgz", + "integrity": "sha512-P5iBg7e0GBi+GPWgqrFJoN1CbraeisofMENz1MzqtXX5krW/ar+gQOUxXhsjMYdRQYy4wiGmqv7Y50xRCNqipw==" }, "@rocket.chat/fuselage-polyfills": { "version": "0.30.1", @@ -5394,9 +5439,9 @@ } }, "@rocket.chat/fuselage-tokens": { - "version": "0.30.1", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.30.1.tgz", - "integrity": "sha512-bnwuNahkG9+EHYjZ8IpKqjxRAHnWHpQGZWwLaLE0XKt7xP8B/ubEQeV7PLDYI0KPJ5oWJCkk8CSf4FGJ9gSyxg==" + "version": "0.6.3-dev.357", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.357.tgz", + "integrity": "sha512-sxI2CLyxDTpFUP8j+BJ8DCFmmxq6x24eiagzNM/ii1HjAyS16hIRCOydYY6h0MG7EtA95BLV7nowRPk1D2dA0Q==" }, "@rocket.chat/fuselage-ui-kit": { "version": "0.30.1", @@ -5410,6 +5455,29 @@ "tslib": "^2.3.1" }, "dependencies": { + "@rocket.chat/fuselage": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.30.1.tgz", + "integrity": "sha512-tO178KfR8GFRuIm/2Lv5f0mKoHS4ZSKAJB6jE5UOrGehDN4kjJ8lKcyCoF24yBKcp/3q8ZbkNTgyGY1nB+jhlQ==", + "requires": { + "@rocket.chat/css-in-js": "^0.30.0", + "@rocket.chat/css-supports": "^0.30.0", + "@rocket.chat/fuselage-tokens": "^0.30.0", + "@rocket.chat/memo": "^0.30.0", + "invariant": "^2.2.4", + "react-keyed-flatten-children": "^1.3.0" + } + }, + "@rocket.chat/fuselage-hooks": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.30.1.tgz", + "integrity": "sha512-9mfe8yx9MjgjYGDKctHqDkV5Byb5PuAXDter1sl37w/Y9gk8TB1tohU+bF88YthBYSLnqBaNWZMsO2zpKuTGiQ==" + }, + "@rocket.chat/fuselage-tokens": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.30.1.tgz", + "integrity": "sha512-bnwuNahkG9+EHYjZ8IpKqjxRAHnWHpQGZWwLaLE0XKt7xP8B/ubEQeV7PLDYI0KPJ5oWJCkk8CSf4FGJ9gSyxg==" + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -5483,6 +5551,11 @@ "tslib": "^2.3.1" }, "dependencies": { + "@rocket.chat/fuselage-hooks": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.30.1.tgz", + "integrity": "sha512-9mfe8yx9MjgjYGDKctHqDkV5Byb5PuAXDter1sl37w/Y9gk8TB1tohU+bF88YthBYSLnqBaNWZMsO2zpKuTGiQ==" + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", diff --git a/package.json b/package.json index adc12dc93f3..bf08ea48e1e 100644 --- a/package.json +++ b/package.json @@ -174,10 +174,10 @@ "@rocket.chat/apps-engine": "^1.28.1", "@rocket.chat/css-in-js": "^0.30.1", "@rocket.chat/emitter": "^0.30.1", - "@rocket.chat/fuselage": "^0.30.1", - "@rocket.chat/fuselage-hooks": "^0.30.1", + "@rocket.chat/fuselage": "^0.6.3-dev.357", + "@rocket.chat/fuselage-hooks": "^0.6.3-dev.358", "@rocket.chat/fuselage-polyfills": "^0.30.1", - "@rocket.chat/fuselage-tokens": "^0.30.1", + "@rocket.chat/fuselage-tokens": "^0.6.3-dev.357", "@rocket.chat/fuselage-ui-kit": "^0.30.1", "@rocket.chat/icons": "^0.30.1", "@rocket.chat/logo": "^0.30.1",