Skip to content

fix(webui): make navbar and license/banner sticky and non-overlapping #9133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(webui): make navbar and license/banner sticky and non-overlapping #9133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions webui/src/lib/components/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ const Layout: FC<{logged: boolean}> = ({ logged }) => {

return (
<>
{/* Sticky license/banner alert placeholder (conditionally rendered in Enterprise) */}
<div id="license-banner-placeholder" className="license-banner-sticky" style={{display: 'none'}}></div>
<TopNav logged={isLogged}/>
<div className="main-app">
<StorageConfigProvider>
Expand Down
2 changes: 1 addition & 1 deletion webui/src/lib/components/navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const TopNav = ({logged = true}) => {
);
}
return (
<Navbar variant="dark" bg="dark" expand="md" className="border-bottom">
<Navbar variant="dark" bg="dark" expand="md" className="border-bottom navbar-sticky">
<Container fluid={true}>
<Link component={Navbar.Brand} href="/">
<img src="/logo.png" alt="lakeFS" className="logo"/>
Expand Down
21 changes: 21 additions & 0 deletions webui/src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,4 +933,25 @@ td.entry-type-indicator {
.geojson-map-container {
height: 100%;
width: 100%;
}

/* Sticky license/banner alert (Enterprise only, placeholder in OSS) */
.license-banner-sticky {
position: sticky;
top: 0;
z-index: 1030;
width: 100%;
}

/* Sticky navbar below the banner */
.navbar-sticky {
position: sticky;
top: 0;
z-index: 1020;
width: 100%;
}

/* If the license banner is visible, push the navbar down */
.license-banner-sticky:has(+ .navbar-sticky) + .navbar-sticky {
top: 48px; /* Adjust to banner height if needed */
}