Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[FIX] Missing margins on select team modal #21965

Merged
merged 1 commit into from
May 10, 2021
Merged

[FIX] Missing margins on select team modal #21965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions client/views/room/contextualBar/Info/ChannelToTeamModal/StepOne.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box } from '@rocket.chat/fuselage';
import { Box, Margins } from '@rocket.chat/fuselage';
import React from 'react';

import GenericModal from '../../../../../components/GenericModal';
Expand All @@ -18,7 +18,12 @@ const StepOne = ({ teamId = '', onChange, onClose, onCancel, onConfirm }) => {
onCancel={onCancel}
onConfirm={onConfirm}
>
<Box withRichContent>{t('Teams_move_channel_to_team_description')}</Box>
<Margins blockEnd='x28'>
<Box>{t('Teams_move_channel_to_team_description_first')}</Box>
<Box>{t('Teams_move_channel_to_team_description_second')}</Box>
<Box>{t('Teams_move_channel_to_team_description_third')}</Box>
<Box>{t('Teams_move_channel_to_team_description_fourth')}</Box>
</Margins>

<Box display='flex' width='100%'>
<TeamAutocomplete onChange={onChange} value={teamId} />
Expand Down
5 changes: 4 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3840,7 +3840,10 @@
"Teams_Errors_team_name": "You can't use \"__name__\" as a team name.",
"Team_Mapping": "Team Mapping",
"Teams_move_channel_to_team": "Move to Team",
"Teams_move_channel_to_team_description": "Moving a Channel inside a Team means that this Channel will be added in the Team’s context, however, all Channel’s members, which are not members of the respective Team, will still have access to this Channel, but will not be added as Team’s members.\n\nAll Channel’s management will still be made by the owners of this Channel.\n\nTeam’s members and even Team’s owners, if not a member of this Channel, can not have access to the Channel’s content.\n\nPlease notice that the Team’s owner will be able to remove members from the Channel.",
"Teams_move_channel_to_team_description_first": "Moving a Channel inside a Team means that this Channel will be added in the Team’s context, however, all Channel’s members, which are not members of the respective Team, will still have access to this Channel, but will not be added as Team’s members.",
"Teams_move_channel_to_team_description_second": "All Channel’s management will still be made by the owners of this Channel.",
"Teams_move_channel_to_team_description_third": "Team’s members and even Team’s owners, if not a member of this Channel, can not have access to the Channel’s content.",
"Teams_move_channel_to_team_description_fourth": "Please notice that the Team’s owner will be able to remove members from the Channel.",
"Teams_move_channel_to_team_confirm_description": "After reading the previous instructions about this behavior, do you want to move forward with this action?",
"Teams_New_Title": "Create Team",
"Teams_New_Name_Label": "Name",
Expand Down