Skip to content

Commit

Permalink
Fixed positioning of the menu dropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
johanna-skylight committed Feb 6, 2025
1 parent c364daf commit 153ce73
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 42 deletions.
11 changes: 4 additions & 7 deletions query-connector/src/app/ui/components/header/header.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,17 @@
}

.menuDropdownContainer {
display: flex;
flex-direction: column;
align-items: flex-end;
justify-content: center;
position: relative;
}

.menuDropdown {
.menuDropdown{
border-radius: 4px !important;
padding: 0.5rem !important;
background: $white !important;
margin: 10.5rem 2rem 0rem 0rem !important;
width: 10rem !important;
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.16);
top:-15px;
right:0px;
}

.menuItem {
Expand Down Expand Up @@ -79,7 +77,6 @@
@media (max-width: 63.99em) {
.menuDropdown {
z-index: 400 !important;
position: absolute;
}
}

Expand Down
69 changes: 34 additions & 35 deletions query-connector/src/app/ui/components/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,42 +124,41 @@ const HeaderComponent: React.FC<{ authDisabled: boolean }> = ({
)}
</div>
</div>
{showMenu && (
<div ref={menuRef} className={styles.menuDropdownContainer}>
<ul
id="dropdown-menu"
className={classNames(`usa-nav__submenu`, styles.menuDropdown)}
>
{/* TODO: Enable this once we can show/hide rules based on actual auth status */}
{/* {isProduction && ( */}
<>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={"/queryBuilding"}>
My queries
</Link>
</li>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={"/fhir-servers"}>
FHIR Servers
</Link>
</li>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={"/userManagement"}>
User Management
</Link>
</li>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={landingPage}>
Log out
</Link>
</li>
</>
{/* )} */}
</ul>
</div>
)}
</header>

{showMenu && (
<div ref={menuRef} className={styles.menuDropdownContainer}>
<ul
id="dropdown-menu"
className={`usa-nav__submenu ${styles.menuDropdown}`}
>
{/* TODO: Enable this once we can show/hide rules based on actual auth status */}
{/* {isProduction && ( */}
<>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={"/queryBuilding"}>
My queries
</Link>
</li>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={"/fhir-servers"}>
FHIR Servers
</Link>
</li>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={"/userManagement"}>
User Management
</Link>
</li>
<li className={styles.subMenuItem}>
<Link className={styles.menuItem} href={landingPage}>
Log out
</Link>
</li>
</>
{/* )} */}
</ul>
</div>
)}
</div>
);
};
Expand Down

0 comments on commit 153ce73

Please sign in to comment.