X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/84befca1b91fc8feeb3258e86ac1a981d47ef914..00ddf216e1a5046a858b1c8b49f0e967404474ca:/src/views-components/main-app-bar/main-app-bar.tsx?ds=sidebyside diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx index ddd39e5e..ba01f550 100644 --- a/src/views-components/main-app-bar/main-app-bar.tsx +++ b/src/views-components/main-app-bar/main-app-bar.tsx @@ -7,19 +7,22 @@ import { AppBar, Toolbar, Typography, Grid } from "@material-ui/core"; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; import { Link } from "react-router-dom"; import { User } from "~/models/user"; -import { SearchBar } from "~/components/search-bar/search-bar"; +import { SearchBar } from "~/views-components/search-bar/search-bar"; import { Routes } from '~/routes/routes'; import { NotificationsMenu } from "~/views-components/main-app-bar/notifications-menu"; import { AccountMenu } from "~/views-components/main-app-bar/account-menu"; -import { AnonymousMenu } from "~/views-components/main-app-bar/anonymous-menu"; import { HelpMenu } from './help-menu'; +import { ReactNode } from "react"; -type CssRules = 'link'; +type CssRules = 'toolbar' | 'link'; const styles: StyleRulesCallback = () => ({ link: { textDecoration: 'none', color: 'inherit' + }, + toolbar: { + height: '56px' } }); @@ -28,6 +31,7 @@ interface MainAppBarDataProps { searchDebounce?: number; user?: User; buildInfo?: string; + children?: ReactNode; } export interface MainAppBarActionProps { @@ -38,8 +42,8 @@ export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & With export const MainAppBar = withStyles(styles)( (props: MainAppBarProps) => { - return - + return + @@ -73,10 +77,11 @@ export const MainAppBar = withStyles(styles)( - : } + : } + {props.children} ; } );