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

Web: components: Added margin-bottom for fixed height of article.

Browse Source
This commit is contained in:
TatianaLopaeva 2021-04-06 17:23:32 +03:00
parent fbf2c27910
commit 6b7bc650da
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/asc-web-common/components/PageLayout/index.js
View File

@ -273,7 +273,7 @@ class PageLayout extends React.Component {
</SubArticleMainButton>
)}
{isArticleBodyAvailable && (
<SubArticleBody>
<SubArticleBody pinned={this.state.isArticlePinned}>
{articleBodyContent ? articleBodyContent.props.children : null}
</SubArticleBody>
)}

6
packages/asc-web-common/components/PageLayout/sub-components/article-body.js
View File

@ -4,6 +4,7 @@ import styled from "styled-components";
import equal from "fast-deep-equal/react";
import Scrollbar from "@appserver/components/scrollbar";
import { tablet, smallTablet } from "@appserver/components/utils/device";
import { isMobile } from "react-device-detect";
const StyledArticleBody = styled.div`
${(props) => props.displayBorder && `outline: 1px dotted;`}
@ -27,6 +28,7 @@ const StyledArticleBody = styled.div`
.people-tree-menu {
margin-right: 0;
${(props) => isMobile && props.pinned && `margin-bottom: 56px`}
}
.custom-scrollbar {
@ -56,10 +58,10 @@ class ArticleBody extends React.Component {
render() {
//console.log("PageLayout ArticleBody render");
const { children } = this.props;
const { children, pinned } = this.props;
return (
<StyledArticleBody>
<StyledArticleBody pinned={pinned}>
<Scrollbar
id="articleScrollBar"
className="custom-scrollbar"