Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
This commit is contained in:
commit
b890ee3296
@ -44,6 +44,13 @@ const StyledElement = styled.div`
|
||||
margin-right: ${(props) => props.theme.row.element.marginRight};
|
||||
margin-left: ${(props) => props.theme.row.element.marginLeft};
|
||||
user-select: none;
|
||||
|
||||
.react-svg-icon svg {
|
||||
margin-top: 4px;
|
||||
}
|
||||
.react-svg-icon.is-edit svg {
|
||||
margin: 4px 0 0 28px;
|
||||
}
|
||||
`;
|
||||
StyledElement.defaultProps = { theme: Base };
|
||||
|
||||
|
@ -173,10 +173,7 @@ const SimpleFilesRow = (props) => {
|
||||
return (
|
||||
<>
|
||||
<ReactSVG
|
||||
beforeInjection={(svg) => {
|
||||
svg.setAttribute("style", "margin-top: 4px");
|
||||
isEdit && svg.setAttribute("style", "margin: 4px 0 0 28px");
|
||||
}}
|
||||
className={`react-svg-icon${isEdit ? " is-edit" : ""}`}
|
||||
src={icon}
|
||||
loading={svgLoader}
|
||||
/>
|
||||
|
@ -178,11 +178,14 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
|
||||
// setModuleInfo(page, "e67be73d-f9ae-4ce1-8fec-1880cb518cb4");
|
||||
}, [page]);
|
||||
|
||||
const pathname = window.location.pathname.toLowerCase();
|
||||
const isEditor = pathname.indexOf("doceditor") !== -1;
|
||||
|
||||
return (
|
||||
<Layout>
|
||||
<Router history={history}>
|
||||
<Box>
|
||||
<NavMenu />
|
||||
{isEditor ? <></> : <NavMenu />}
|
||||
<ScrollToTop />
|
||||
<Main>
|
||||
<Switch>
|
||||
|
Loading…
Reference in New Issue
Block a user