Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
This commit is contained in:
commit
d7c5c431d0
@ -62,6 +62,7 @@ const UsersRow = (props) => {
|
||||
checked={isChecked}
|
||||
onClick={handleAccountToggle}
|
||||
isDisabled={!isPrevEmailValid}
|
||||
contextButtonSpacerWidth="0"
|
||||
>
|
||||
<UsersRowContent
|
||||
t={t}
|
||||
|
@ -49,6 +49,9 @@ const EmailInputWrapper = styled.div`
|
||||
const DecisionButton = styled(Button)`
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
path {
|
||||
fill: ${(props) => props.theme.client.settings.migration.tableHeaderText};
|
||||
}
|
||||
`;
|
||||
|
||||
DecisionButton.defaultProps = { theme: Base };
|
||||
@ -71,13 +74,19 @@ const StyledRowContent = styled(RowContent)`
|
||||
|
||||
.user-email {
|
||||
margin-inline-end: 5px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: ${(props) =>
|
||||
props.theme.client.settings.migration.tableRowTextColor};
|
||||
|
||||
path {
|
||||
fill: #a3a9ae;
|
||||
fill: ${(props) => props.theme.client.settings.migration.tableHeaderText};
|
||||
}
|
||||
}
|
||||
|
||||
.row-main-container-wrapper {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mainIcons {
|
||||
@ -156,14 +165,14 @@ const UsersRowContent = ({
|
||||
<Text fontWeight={600} fontSize="14px">
|
||||
{displayName}
|
||||
</Text>
|
||||
<Text fontWeight={600} fontSize="12px" color="#A3A9AE">
|
||||
<Text className="user-email">
|
||||
{prevEmail === "" ? t("Settings:NoEmail") : prevEmail}
|
||||
</Text>
|
||||
</div>
|
||||
{isEmailOpen ? (
|
||||
<EmailInputWrapper ref={emailInputRef}>
|
||||
<EmailInput
|
||||
placeholder={t("Settings:NoEmail")}
|
||||
placeholder={t("EnterEmail")}
|
||||
className="import-email-input"
|
||||
value={tempEmail}
|
||||
onChange={handleEmailChange}
|
||||
|
@ -34,11 +34,21 @@ import UsersRow from "./UsersRow";
|
||||
import { Row } from "@docspace/shared/components/row";
|
||||
import { Text } from "@docspace/shared/components/text";
|
||||
|
||||
const StyledRowContainer = styled(RowContainer)`
|
||||
margin: 0 0 20px;
|
||||
`;
|
||||
|
||||
const StyledRow = styled(Row)`
|
||||
box-sizing: border-box;
|
||||
height: 40px;
|
||||
min-height: 40px;
|
||||
|
||||
.row-header-title {
|
||||
color: ${(props) => props.theme.client.settings.migration.tableHeaderText};
|
||||
font-weight: 600;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
@media ${tablet} {
|
||||
.row_content {
|
||||
height: auto;
|
||||
@ -76,7 +86,7 @@ const RowView = (props) => {
|
||||
checkedUsers.withoutEmail.length !== usersWithFilledEmails.length;
|
||||
|
||||
return (
|
||||
<RowContainer useReactWindow={false}>
|
||||
<StyledRowContainer useReactWindow={false}>
|
||||
<StyledRow
|
||||
sectionWidth={sectionWidth}
|
||||
checked={
|
||||
@ -87,9 +97,7 @@ const RowView = (props) => {
|
||||
indeterminate={isIndeterminate}
|
||||
isDisabled={usersWithFilledEmails.length === 0}
|
||||
>
|
||||
<Text color="#a3a9ae" fontWeight={600} fontSize="12px">
|
||||
{t("Common:Name")}
|
||||
</Text>
|
||||
<Text className="row-header-title">{t("Common:Name")}</Text>
|
||||
</StyledRow>
|
||||
{accountsData.map((data) => (
|
||||
<UsersRow
|
||||
@ -103,7 +111,7 @@ const RowView = (props) => {
|
||||
setOpenedEmailKey={setOpenedEmailKey}
|
||||
/>
|
||||
))}
|
||||
</RowContainer>
|
||||
</StyledRowContainer>
|
||||
);
|
||||
};
|
||||
|
||||
|
@ -58,25 +58,27 @@ const StyledTableRow = styled(TableRow)`
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
overflow: hidden;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: ${(props) =>
|
||||
props.theme.client.settings.migration.tableRowTextColor};
|
||||
|
||||
path {
|
||||
fill: #a3a9ae;
|
||||
fill: ${(props) => props.theme.client.settings.migration.tableHeaderText};
|
||||
}
|
||||
}
|
||||
|
||||
.import-email-input {
|
||||
width: 357.67px;
|
||||
}
|
||||
|
||||
.textOverflow {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
`;
|
||||
|
||||
const DecisionButton = styled(Button)`
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
path {
|
||||
fill: ${(props) => props.theme.client.settings.migration.tableHeaderText};
|
||||
}
|
||||
`;
|
||||
|
||||
DecisionButton.defaultProps = { theme: Base };
|
||||
@ -169,7 +171,7 @@ const UsersTableRow = ({
|
||||
isChecked={isChecked}
|
||||
isDisabled={!isPrevEmailValid}
|
||||
/>
|
||||
<Text fontWeight={600} className="textOverflow">
|
||||
<Text fontWeight={600} truncate>
|
||||
{displayName}
|
||||
</Text>
|
||||
</TableCell>
|
||||
@ -196,7 +198,7 @@ const UsersTableRow = ({
|
||||
) : (
|
||||
<span onClick={openEmail} className="user-email" ref={emailTextRef}>
|
||||
<EditSvg />
|
||||
<Text fontWeight={600} color="#A3A9AE" className="textOverflow">
|
||||
<Text className="user-email" truncate>
|
||||
{prevEmail !== "" ? prevEmail : t("Settings:NoEmail")}
|
||||
</Text>
|
||||
</span>
|
||||
|
Loading…
Reference in New Issue
Block a user