Skip to content
Snippets Groups Projects

Merge branch 'develop' into 'master'

Merged BISSON REMI requested to merge 21-rename-pages-in-left-menu-and-titles into develop
2 files
+ 18
112
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -62,7 +62,7 @@ export default function Header(props) {
/>
)}
</IconButton>
<Typography variant="h6" weight="medium" className={classes.logotype}>
<Typography variant="h6" weight="medium" className={classes.title}>
IN-SYLVA IS administration Portal
</Typography>
<div className={classes.grow} />
@@ -85,23 +85,20 @@ export default function Header(props) {
disableAutoFocusItem
>
<div className={classes.profileMenuUser}>
<Typography variant="h4" weight="medium">
{user.username}
</Typography>
</div>
<MenuItem
className={classNames(classes.profileMenuItem, classes.headerMenuItem)}
>
<AccountIcon className={classes.profileMenuIcon} /> Profile
</MenuItem>
<div className={classes.profileMenuUser}>
<Typography
className={classes.profileMenuLink}
color="primary"
onClick={() => signOut(userDispatch, props.history)}
>
Sign out
</Typography>
<div className={classes.profileMenuItem}>
<Typography variant="h4" weight="medium">
{user.username}
</Typography>
</div>
<div className={classes.profileMenuItem}>
<Typography
className={classes.profileMenuLink}
color="primary"
onClick={() => signOut(userDispatch, props.history)}
>
Sign out
</Typography>
</div>
</div>
</Menu>
</Toolbar>
Loading