Dev 1.3 #72

Merged
LukeGus merged 23 commits from dev-1.3 into main 2025-08-19 05:13:56 +00:00
2 changed files with 25 additions and 12 deletions
Showing only changes of commit 58947f4455 - Show all commits
+22
View File
@@ -0,0 +1,22 @@
import React from "react";
import {ButtonGroup} from "@/components/ui/button-group.tsx";
import {Button} from "@/components/ui/button.tsx";
import {SeparatorVertical, X} from "lucide-react";
export function Tab(): React.ReactElement {
return (
<div>
<ButtonGroup>
<Button variant="outline" className="!px-2 border-1 border-[#303032]">
Server Name
</Button>
<Button variant="outline" className="!px-2 border-1 border-[#303032]">
<SeparatorVertical className="w-[28px] h-[28px]" />
</Button>
<Button variant="outline" className="!px-2 border-1 border-[#303032]">
<X/>
</Button>
</ButtonGroup>
</div>
)
}
+3 -12
View File
@@ -2,6 +2,7 @@ import React from "react";
import {useSidebar} from "@/components/ui/sidebar"; import {useSidebar} from "@/components/ui/sidebar";
import {Button} from "@/components/ui/button.tsx"; import {Button} from "@/components/ui/button.tsx";
import {ChevronDown, ChevronUpIcon} from "lucide-react"; import {ChevronDown, ChevronUpIcon} from "lucide-react";
import {Tab} from "@/ui/Navigation/Tabs/Tab.tsx";
interface TopNavbarProps { interface TopNavbarProps {
isTopbarOpen: boolean; isTopbarOpen: boolean;
@@ -10,17 +11,7 @@ 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"; const leftPosition = state === "collapsed" ? "26px" : "264px";
console.log("TopNavbar - Calculated left position:", leftPosition);
return ( return (
<div> <div>
@@ -36,8 +27,8 @@ export function TopNavbar({isTopbarOpen, setIsTopbarOpen}: TopNavbarProps): Reac
padding: "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)] flex items-center overflow-x-scroll gap-2">
test <Tab/>
</div> </div>
<div className="flex items-center justify-center flex-1"> <div className="flex items-center justify-center flex-1">