diff --git a/esp/src/eclwatch/css/hpcc.css b/esp/src/eclwatch/css/hpcc.css index 26559935861..b06cce1d7f3 100644 --- a/esp/src/eclwatch/css/hpcc.css +++ b/esp/src/eclwatch/css/hpcc.css @@ -27,11 +27,6 @@ body { padding: 0; } -button:hover { - color: rgb(0, 0, 0); - background-color: rgb(175, 217, 255); -} - h1 { font-size: 1.5em; } diff --git a/esp/src/eclwatch/templates/HPCCPlatformWidget.html b/esp/src/eclwatch/templates/HPCCPlatformWidget.html index 02dc32b9c36..66cbccddd44 100644 --- a/esp/src/eclwatch/templates/HPCCPlatformWidget.html +++ b/esp/src/eclwatch/templates/HPCCPlatformWidget.html @@ -110,7 +110,7 @@
- +
diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json index 48b8ad30daf..e47033c910d 100644 --- a/esp/src/package-lock.json +++ b/esp/src/package-lock.json @@ -1200,7 +1200,8 @@ "@fluentui/react-theme": "^9.1.16", "@fluentui/react-utilities": "^9.18.0", "@griffel/react": "^1.5.14", - "@swc/helpers": "^0.5.1" + "@swc/helpers": "^0.5.1", + "floating-ui-devtools": "0.1.2" }, "peerDependencies": { "@types/react": ">=16.14.0 <19.0.0", @@ -5983,6 +5984,14 @@ "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", "dev": true }, + "node_modules/floating-ui-devtools": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/floating-ui-devtools/-/floating-ui-devtools-0.1.2.tgz", + "integrity": "sha512-6QZH99AdZx9by0fJt2AI0axAeOxLpcHgpmaJXYxJWLCblv9iKz7i4lcLKwYvPA9B5brkLwehgjlbi2kI6uq/Eg==", + "peerDependencies": { + "@floating-ui/dom": ">=1.0.0 <2.0.0" + } + }, "node_modules/follow-redirects": { "version": "1.15.5", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", diff --git a/esp/src/src-react/components/Menu.tsx b/esp/src/src-react/components/Menu.tsx index 382df996894..2206b65d4d2 100644 --- a/esp/src/src-react/components/Menu.tsx +++ b/esp/src/src-react/components/Menu.tsx @@ -3,12 +3,13 @@ import { IconButton, IContextualMenuItem, INavLink, INavLinkGroup, Link, mergeSt import { useConst } from "@fluentui/react-hooks"; import nlsHPCC from "src/nlsHPCC"; import { hasLogAccess } from "src/ESPLog"; -import { containerized, bare_metal } from "src/BuildInfo"; +import { cmake_build_type, containerized, bare_metal } from "src/BuildInfo"; import { MainNav, routes } from "../routes"; import { useFavorite, useFavorites, useHistory } from "../hooks/favorite"; import { useUserTheme } from "../hooks/theme"; import { usePivotItemDisable } from "../layouts/pivot"; import { Breadcrumbs } from "./Breadcrumbs"; +import { Settings } from "./Settings"; // Top Level Nav --- function navLinkGroups(): INavLinkGroup[] { @@ -98,14 +99,16 @@ export const MainNavigation: React.FunctionComponent = ({ hashPath }) => { - const menu = useConst(() => [...navLinkGroups()]); - const { theme, setTheme, isDark } = useUserTheme(); + const menu = useConst([...navLinkGroups()]); + const { theme, setThemeDark, isDark } = useUserTheme(); + + const [showSettings, setShowSettings] = React.useState(false); const selKey = React.useMemo(() => { return navSelectedKey(hashPath); }, [hashPath]); - return + return