Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
This commit is contained in:
commit
641dc357b4
@ -44,6 +44,7 @@ const Navigation = ({
|
||||
withMenu,
|
||||
onPlusClick,
|
||||
isEmptyPage,
|
||||
isDesktop: isDesktopClient,
|
||||
...rest
|
||||
}) => {
|
||||
const [isOpen, setIsOpen] = React.useState(false);
|
||||
@ -153,6 +154,7 @@ const Navigation = ({
|
||||
toggleInfoPanel={toggleInfoPanel}
|
||||
isInfoPanelVisible={isInfoPanelVisible}
|
||||
onClickAvailable={onClickAvailable}
|
||||
isDesktopClient={isDesktopClient}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
@ -164,6 +166,7 @@ const Navigation = ({
|
||||
isTabletView={isTabletView}
|
||||
isRecycleBinFolder={isRecycleBinFolder}
|
||||
isDesktop={isDesktop}
|
||||
isDesktopClient={isDesktopClient}
|
||||
isInfoPanelVisible={isInfoPanelVisible}
|
||||
>
|
||||
<ArrowButton
|
||||
|
@ -24,6 +24,11 @@ const StyledContainer = styled.div`
|
||||
props.isRootFolder ? "auto 1fr" : "49px auto 1fr"};
|
||||
|
||||
height: 100%;
|
||||
${(props) =>
|
||||
props.isDesktopClient &&
|
||||
css`
|
||||
max-height: 32px;
|
||||
`}
|
||||
|
||||
.navigation-arrow-container {
|
||||
display: flex;
|
||||
|
@ -108,6 +108,7 @@ const DropBox = React.forwardRef(
|
||||
maxHeight,
|
||||
isOpen,
|
||||
isDesktop,
|
||||
isDesktopClient,
|
||||
},
|
||||
ref
|
||||
) => {
|
||||
@ -157,6 +158,7 @@ const DropBox = React.forwardRef(
|
||||
canCreate={canCreate}
|
||||
isDropBox={true}
|
||||
isInfoPanelVisible={isInfoPanelVisible}
|
||||
isDesktopClient={isDesktopClient}
|
||||
>
|
||||
<ArrowButton
|
||||
isRootFolder={isRootFolder}
|
||||
|
Loading…
Reference in New Issue
Block a user