Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations

This commit is contained in:
Nikita Gopienko 2021-01-13 10:32:33 +03:00
commit 857b90e371
4 changed files with 5 additions and 14 deletions

View File

@ -147,11 +147,7 @@ class ConsumerModalDialog extends React.Component {
return (
<ModalDialogContainer>
<ModalDialog
visible={dialogVisible}
onClose={onModalClose}
className="consumer-modal-dialog"
>
<ModalDialog visible={dialogVisible} onClose={onModalClose}>
<ModalDialog.Header>{selectedConsumer.title}</ModalDialog.Header>
<ModalDialog.Body>
<Text as="div">{consumerInstruction}</Text>

View File

@ -21,12 +21,6 @@ const { getUrlAuthKeys } = commonStore.auth.selectors;
const tablet = utils.device.tablet;
const mobile = utils.device.mobile;
const StyledThirdPartyServices = styled(Box)`
.consumer-modal-dialog {
cursor: default;
}
`;
const RootContainer = styled(Box)`
@media ${tablet} {
margin: 0;
@ -139,7 +133,7 @@ class ThirdPartyServices extends React.Component {
const { onModalClose, onModalOpen, setConsumer, onChangeLoading } = this;
return (
<StyledThirdPartyServices>
<>
<RootContainer
displayProp="flex"
flexDirection="column"
@ -201,7 +195,7 @@ class ThirdPartyServices extends React.Component {
updateConsumerProps={updateConsumerProps}
/>
)}
</StyledThirdPartyServices>
</>
);
}
}

View File

@ -1,6 +1,6 @@
{
"name": "asc-web-components",
"version": "1.0.500",
"version": "1.0.501",
"description": "Ascensio System SIA component library",
"license": "AGPL-3.0",
"main": "dist/asc-web-components.js",

View File

@ -17,6 +17,7 @@ const Dialog = styled.div`
display: flex;
align-items: center;
min-height: 100%;
cursor: default;
`;
const Content = styled.div`