IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/restore-data-import' of github.com:ONLYOFFICE/DocSpace-client into bugfix/restore-data-import

Browse Source
This commit is contained in:
Alexey Safronov 2024-07-31 13:32:42 +04:00
commit c3626829a4
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/index.tsx
View File

@ -187,9 +187,12 @@ const AddEmailsStep = (props: AddEmailsStepProps) => {
)} )}
</> </>
) : ( ) : (
<Text fontWeight={600} lineHeight="20px" className="mb-17"> <>
{t("Settings:WithoutEmailHint")} <Text fontWeight={600} lineHeight="20px" className="mb-17">
</Text> {t("Settings:WithoutEmailHint")}
</Text>
{Buttons}
</>
)} )}
{filteredAccounts.length > 0 && Buttons} {filteredAccounts.length > 0 && Buttons}

9
packages/client/src/pages/PortalSettings/categories/data-import/components/SelectFileStep.tsx
View File

@ -86,6 +86,12 @@ const Wrapper = styled.div`
const FileUploadContainer = styled.div` const FileUploadContainer = styled.div`
max-width: 350px; max-width: 350px;
.cancel-btn {
@media ${mobile} {
height: 40px;
}
}
.cancelUploadButton { .cancelUploadButton {
@media ${mobile} { @media ${mobile} {
margin-bottom: 0; margin-bottom: 0;
@ -413,7 +419,8 @@ const SelectFileStep = (props: SelectFileStepProps) => {
/> />
<div className="cancelUploadButton"> <div className="cancelUploadButton">
<Button <Button
size={isTablet() ? ButtonSize.medium : ButtonSize.normal} size={isTablet() ? ButtonSize.medium : ButtonSize.small}
className="cancel-btn"
label={t("Common:CancelButton")} label={t("Common:CancelButton")}
onClick={onCancel} onClick={onCancel}
scale={isMobile()} scale={isMobile()}