Dev 1.3 #72

Merged
LukeGus merged 23 commits from dev-1.3 into main 2025-08-19 05:13:56 +00:00
Showing only changes of commit b7f52d4d73 - Show all commits
+17 -2
View File
@@ -11,14 +11,29 @@ interface TopNavbarProps {
export function TopNavbar({isTopbarOpen, setIsTopbarOpen}: TopNavbarProps): React.ReactElement { export function TopNavbar({isTopbarOpen, setIsTopbarOpen}: TopNavbarProps): React.ReactElement {
const {state} = useSidebar(); const {state} = useSidebar();
// Debug logging
console.log("TopNavbar - Sidebar state:", state);
console.log("TopNavbar - State type:", typeof state);
console.log("TopNavbar - State === 'collapsed':", state === "collapsed");
// Adjust pixel values to get exactly 15px margins
// Current left margin when expanded is 15px (perfect), when collapsed is 38px (need to reduce by 23px)
// Current right margin is 15px (perfect)
const leftPosition = state === "collapsed" ? "26px" : "264px";
console.log("TopNavbar - Calculated left position:", leftPosition);
return ( return (
<div> <div>
<div <div
className="fixed z-10 h-[50px] bg-[#18181b] border-2 border-[#303032] rounded-lg transition-all duration-200 ease-linear flex flex-row" className="fixed z-10 h-[50px] bg-[#18181b] border-2 border-[#303032] rounded-lg transition-all duration-200 ease-linear flex flex-row"
style={{ style={{
top: isTopbarOpen ? "0.5rem" : "-3rem", top: isTopbarOpen ? "0.5rem" : "-3rem",
left: state === "collapsed" ? "calc(1.5rem + 0.5rem)" : "calc(16rem + 0.5rem)", left: leftPosition,
right: "0.5rem" right: "17px",
position: "fixed",
transform: "none",
margin: "0",
padding: "0"
}} }}
> >
<div className="h-full p-1 pr-2 border-r-2 border-[#303032] w-[calc(100%-3rem)]"> <div className="h-full p-1 pr-2 border-r-2 border-[#303032] w-[calc(100%-3rem)]">