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

Merge branch 'release/v0.0.2' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into release/v0.0.2

Browse Source
This commit is contained in:
Nikita Gopienko 2020-12-11 15:41:34 +03:00
commit 6e0dd74e3e
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
View File

@ -62,25 +62,30 @@ const { Consumer } = utils.context;
const StyledContainer = styled.div`
.header-container {
position: relative;
display: grid;
grid-template-columns: ${(props) =>
props.isRootFolder
? "auto auto 1fr"
: props.canCreate
? "auto auto auto auto 1fr"
: "auto auto auto 1fr"};
${(props) =>
props.title &&
css`
display: grid;
grid-template-columns: ${(props) =>
props.isRootFolder
? "auto auto 1fr"
: props.canCreate
? "auto auto auto auto 1fr"
: "auto auto auto 1fr"};
@media ${tablet} {
grid-template-columns: ${(props) =>
props.isRootFolder
? "1fr auto"
: props.canCreate
? "auto 1fr auto auto"
: "auto 1fr auto"};
}
`}
align-items: center;
max-width: calc(100vw - 32px);
@media ${tablet} {
grid-template-columns: ${(props) =>
props.isRootFolder
? "1fr auto"
: props.canCreate
? "auto 1fr auto auto"
: "auto 1fr auto"};
.headline-header {
margin-left: -1px;
}
@ -530,6 +535,7 @@ class SectionHeaderContent extends React.Component {
width={context.sectionWidth}
isRootFolder={isRootFolder}
canCreate={canCreate}
title={title}
>
{isHeaderVisible ? (
<div className="group-button-menu-container">

18
products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
View File

@ -75,15 +75,20 @@ const StyledContainer = styled.div`
.header-container {
position: relative;
display: grid;
grid-template-columns: auto auto 1fr;
${(props) =>
props.isLoaded &&
css`
display: grid;
grid-template-columns: auto auto 1fr;
@media ${tablet} {
grid-template-columns: 1fr auto;
}
`}
align-items: center;
max-width: calc(100vw - 32px);
@media ${tablet} {
grid-template-columns: 1fr auto;
}
.action-button {
margin-left: 16px;
@ -356,6 +361,7 @@ const SectionHeaderContent = (props) => {
{(context) => (
<StyledContainer
isHeaderVisible={isHeaderVisible}
isLoaded={isLoaded}
width={context.sectionWidth}
>
{employeeDialogVisible && (