Skip to content

Commit

Permalink
Merge branch 'develop' into feature/hidden-contenttypes
Browse files Browse the repository at this point in the history
  • Loading branch information
tusmester committed Nov 14, 2023
2 parents 809b72e + e45ac59 commit 7155e78
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 21 deletions.
8 changes: 0 additions & 8 deletions apps/sensenet/src/components/appbar/desktop-nav-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Grid, IconButton, ListItemIcon, ListItemText, MenuItem, MenuList, Paper
import ClickAwayListener from '@material-ui/core/ClickAwayListener'
import { createStyles, makeStyles, Theme, useTheme } from '@material-ui/core/styles'
import KeyboardArrowDown from '@material-ui/icons/KeyboardArrowDown'
import Notifications from '@material-ui/icons/Notifications'
import { Switch } from '@sensenet/controls-react'
import { useInjector, useRepository } from '@sensenet/hooks-react'
import { clsx } from 'clsx'
Expand Down Expand Up @@ -102,13 +101,6 @@ export const DesktopNavMenu: FunctionComponent = () => {

return (
<div className={clsx(globalClasses.centered, classes.navMenu)}>
<IconButton
id="olvy-trigger"
aria-label={localization.topMenu.openNewMenu}
className={classes.iconButton}
style={{ marginRight: '16px' }}>
<Notifications className={classes.icon} />
</IconButton>
<>
<UserAvatar
user={currentUser}
Expand Down
5 changes: 0 additions & 5 deletions apps/sensenet/src/components/settings/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ export const Settings: React.FunctionComponent = () => {
displayName: localizationDrawer.titles.Webhooks,
url: resolvePathParams({ path: PATHS.settings.appPath, params: { submenu: 'webhooks' } }),
},
{
name: 'adminui',
displayName: localizationDrawer.titles.AdminUiCustomization,
url: resolvePathParams({ path: PATHS.settings.appPath, params: { submenu: 'adminui' } }),
},
]

const renderContent = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ export class NavigationCommandProvider implements CommandProvider {
keywords: 'saved query search find',
hits: [term],
},
{
primaryText: this.localizationValues.eventsPrimary,
url: resolvePathParams({ path: PATHS.events.appPath }),
secondaryText: this.localizationValues.eventsSecondary,
content: { Icon: 'EventLog' } as any,
keywords: 'event events error warning log logs',
hits: [term],
},
]
}

Expand Down

0 comments on commit 7155e78

Please sign in to comment.