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

Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0

Browse Source
This commit is contained in:
Viktor Fomin 2022-12-22 14:56:35 +03:00
commit acb4747647
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/common/components/Section/index.js
View File

@ -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));

6
packages/common/components/Section/sub-components/section-container.js
View File

@ -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;
}