Commit dd1f182b authored by Axel Bocciarelli's avatar Axel Bocciarelli
Browse files

Merge branch 'manager-menu' into 'master'

Restrict max-height of manager menu

Closes #399

See merge request !422
parents e2b72056 8c1edc10
Pipeline #31949 passed with stages
in 7 minutes and 32 seconds
......@@ -2,6 +2,7 @@ import { uniq } from 'lodash-es';
import React from 'react';
import { Button, Glyphicon, MenuItem, NavDropdown } from 'react-bootstrap';
import { LinkContainer } from 'react-router-bootstrap';
import styles from './Menu.module.css';
class ManagerMenu extends React.Component {
getBeamlineList(instruments) {
......@@ -97,6 +98,7 @@ class ManagerMenu extends React.Component {
eventKey={3}
title={navDropdownTitle}
id="basic-nav-dropdown"
className={styles.managerMenu}
>
<LinkContainer to="/usermanagement">
<MenuItem eventKey={3.3}>
......
......@@ -6,3 +6,9 @@
display: flex;
align-items: center;
}
.managerMenu > :global(.dropdown-menu) {
max-height: 40rem;
overflow: hidden scroll;
scrollbar-width: thin;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment