Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0
This commit is contained in:
commit
acb4747647
@ -159,6 +159,7 @@ class Section extends React.Component {
|
||||
settingsStudio,
|
||||
clearUploadedFilesHistory,
|
||||
withPaging,
|
||||
isInfoPanelVisible,
|
||||
} = this.props;
|
||||
|
||||
let sectionHeaderContent = null;
|
||||
@ -237,6 +238,7 @@ class Section extends React.Component {
|
||||
maintenanceExist={maintenanceExist}
|
||||
isSectionHeaderAvailable={isSectionHeaderAvailable}
|
||||
settingsStudio={settingsStudio}
|
||||
isInfoPanelVisible={isInfoPanelVisible}
|
||||
>
|
||||
{isSectionHeaderAvailable && !isMobile && (
|
||||
<SubSectionHeader
|
||||
@ -470,6 +472,8 @@ export default inject(({ auth }) => {
|
||||
showText,
|
||||
} = settingsStore;
|
||||
|
||||
const { isVisible: isInfoPanelVisible } = auth.infoPanelStore;
|
||||
|
||||
return {
|
||||
isTabletView,
|
||||
isHeaderVisible,
|
||||
@ -479,5 +483,7 @@ export default inject(({ auth }) => {
|
||||
setMaintenanceExist,
|
||||
|
||||
showText,
|
||||
|
||||
isInfoPanelVisible,
|
||||
};
|
||||
})(observer(Section));
|
||||
|
@ -74,13 +74,15 @@ const StyledSectionContainer = styled.section`
|
||||
|
||||
.layout-progress-bar {
|
||||
position: fixed;
|
||||
right: 15px;
|
||||
right: ${(props) =>
|
||||
props.isInfoPanelVisible && !isMobile ? "416px" : "15px"};
|
||||
bottom: 21px;
|
||||
}
|
||||
|
||||
.layout-progress-second-bar {
|
||||
position: fixed;
|
||||
right: 15px;
|
||||
right: ${(props) =>
|
||||
props.isInfoPanelVisible && !isMobile ? "416px" : "15px"};
|
||||
bottom: 83px;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user