Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
This commit is contained in:
commit
8ec3d02ab9
@ -16,6 +16,12 @@ const StyledContainer = styled.div`
|
||||
min-width: 17px;
|
||||
}
|
||||
|
||||
.headline-heading {
|
||||
display: flex;
|
||||
height: 32px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@media ${tablet} {
|
||||
width: 100%;
|
||||
grid-template-columns: ${(props) =>
|
||||
|
@ -81,8 +81,10 @@ class AvatarEditor extends React.Component {
|
||||
};
|
||||
|
||||
onClose = () => {
|
||||
this.setState({ visible: false });
|
||||
this.props.onClose();
|
||||
if (this.state.visible) {
|
||||
this.setState({ visible: false });
|
||||
this.props.onClose();
|
||||
}
|
||||
};
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
|
@ -14,7 +14,7 @@ export const tablet = `(max-width: ${size.tablet}px)`;
|
||||
export const desktop = `(min-width: ${size.desktop}px)`;
|
||||
|
||||
export const isMobile = () => {
|
||||
return window.innerWidth < size.mobile;
|
||||
return window.innerWidth <= size.mobile;
|
||||
};
|
||||
|
||||
export const isSmallTablet = () => {
|
||||
|
@ -67,6 +67,10 @@ const ModalDialogContainer = styled(ModalDialog)`
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.heading {
|
||||
max-width: calc(100% - 32px);
|
||||
}
|
||||
`;
|
||||
|
||||
ModalDialogContainer.defaultProps = { theme: Base };
|
||||
|
Loading…
Reference in New Issue
Block a user