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

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

Browse Source
This commit is contained in:
Tatiana Lopaeva 2022-11-30 13:54:14 +03:00
commit 1b9ab5a083
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/common/components/Navigation/StyledNavigation.js
View File

@ -21,15 +21,30 @@ const StyledContainer = styled.div`
display: grid;
align-items: center;
grid-template-columns: ${(props) =>
props.isRootFolder ? "auto 1fr" : "29px auto 1fr"};
props.isRootFolder ? "auto 1fr" : "49px auto 1fr"};
height: 100%;
.navigation-arrow-container {
display: flex;
}
.arrow-button {
width: 17px;
min-width: 17px;
}
.navigation-header-separator {
display: block;
padding-left: 16px;
border-right: ${(props) =>
`1px solid ${props.theme.navigation.icon.stroke}`};
@media ${mobile} {
display: none;
}
}
.headline-heading {
display: flex;
height: 32px;
@ -38,6 +53,11 @@ const StyledContainer = styled.div`
@media ${tablet} {
width: 100%;
grid-template-columns: ${(props) =>
props.isRootFolder ? "auto 1fr" : "49px 1fr auto"};
}
@media ${mobile} {
grid-template-columns: ${(props) =>
props.isRootFolder ? "auto 1fr" : "29px 1fr auto"};
}
@ -46,7 +66,7 @@ const StyledContainer = styled.div`
css`
width: 100%;
grid-template-columns: ${(props) =>
props.isRootFolder ? "auto 1fr" : "29px 1fr auto"};
props.isRootFolder ? "auto 1fr" : "49px 1fr auto"};
display: flex;
align-items: center;
justify-content: space-between;

17
packages/common/components/Navigation/sub-components/arrow-btn.js
View File

@ -5,13 +5,16 @@ const ArrowButton = ({ isRootFolder, onBackToParentFolder }) => {
return (
<>
{!isRootFolder ? (
<IconButton
iconName="/static/images/arrow.path.react.svg"
size="17"
isFill={true}
onClick={onBackToParentFolder}
className="arrow-button"
/>
<div className="navigation-arrow-container">
<IconButton
iconName="/static/images/arrow.path.react.svg"
size="17"
isFill={true}
onClick={onBackToParentFolder}
className="arrow-button"
/>
<div className="navigation-header-separator" />
</div>
) : (
<></>
)}