diff --git a/packages/web/src/components/Header/Header.module.css b/packages/web/src/components/Header/Header.module.css index c82ec54b7..bd19e66c2 100644 --- a/packages/web/src/components/Header/Header.module.css +++ b/packages/web/src/components/Header/Header.module.css @@ -57,3 +57,8 @@ background-color: var(--aqua-secondary-hover); color: var(--aqua); } + +.upload-button-label { + font-weight: 400; + font-size: 14px; +} diff --git a/packages/web/src/components/Header/Help.module.css b/packages/web/src/components/Header/Help.module.css index d18704ffe..07f356f4a 100644 --- a/packages/web/src/components/Header/Help.module.css +++ b/packages/web/src/components/Header/Help.module.css @@ -41,3 +41,7 @@ border: none !important; } +.help-menu-label { + font-weight: 400; + font-size: 16px; +} diff --git a/packages/web/src/components/Header/Help.tsx b/packages/web/src/components/Header/Help.tsx index cde9d2ae7..96a2f3c07 100644 --- a/packages/web/src/components/Header/Help.tsx +++ b/packages/web/src/components/Header/Help.tsx @@ -1,7 +1,6 @@ -import classNames from "classnames"; import { DirectionalHint, IContextualMenuItem, PrimaryButton } from "@fluentui/react"; +import classNames from "classnames"; import * as React from "react"; -import { useNavigate } from "react-router-dom"; import styles from "./Help.module.css"; @@ -9,40 +8,21 @@ interface Props { path: string; } -// Banner for the splash page export default function HelpMenu(props: Props) { - const isApp: boolean = props.path == "/app"; - const navigate = useNavigate(); - - function redirect( - ev?: React.MouseEvent | React.KeyboardEvent, - item?: IContextualMenuItem - ): void { - if (item?.data) { - if (isApp) { - window.open(item.data, "_blank", "noreferrer"); // open in new tab while in app - } else navigate(item.data); - } - } + const isAppRoute: boolean = props.path == "/app"; const helpMenuOptions: IContextualMenuItem[] = [ - { - key: "learn", - text: "Learn", - data: "/learn", // path for router - onClick: redirect, - }, { key: "tutorials", text: "In-app tutorials", - style: !isApp ? { display: "none" } : {}, + style: !isAppRoute ? { display: "none" } : {}, }, { key: "reportissue", text: `Report issue in GitHub`, href: "https://github.com/AllenInstitute/aics-fms-file-explorer-app/issues", target: "_blank", - style: !isApp ? { display: "none" } : {}, + style: !isAppRoute ? { display: "none" } : {}, }, { key: "github", @@ -57,7 +37,7 @@ export default function HelpMenu(props: Props) { { key: "version", text: "Version info", - style: !isApp ? { display: "none" } : {}, + style: !isAppRoute ? { display: "none" } : {}, }, ]; @@ -65,7 +45,7 @@ export default function HelpMenu(props: Props) { ); diff --git a/packages/web/src/components/Header/index.tsx b/packages/web/src/components/Header/index.tsx index 407ab74e8..026a1a76b 100644 --- a/packages/web/src/components/Header/index.tsx +++ b/packages/web/src/components/Header/index.tsx @@ -42,7 +42,7 @@ export default function Header() { {currentPath !== "/app" && (