Skip to content

Commit b3f0f1a

Browse files
committed
🤖 fix: match sidebar colors exactly to main branch
- ProjectSidebar: bg-separator + bg-hover for selected/hover - RightSidebar: bg-separator + border-border-light - LeftSidebar: bg-separator + border-border - Added semantic colors: --color-separator (15%), --color-hover (16.5%) - These match original theme exactly instead of using neutral-800/900
1 parent c405fdf commit b3f0f1a

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

src/components/LeftSidebar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export function LeftSidebar(props: LeftSidebarProps) {
4646
aria-label="Open sidebar menu"
4747
className={cn(
4848
"hidden max-md:flex fixed top-3 left-3 z-[998]",
49-
"w-10 h-10 bg-neutral-800 border border-neutral-800 rounded-md cursor-pointer",
49+
"w-10 h-10 bg-separator border border-border-light rounded-md cursor-pointer",
5050
"items-center justify-center text-neutral-300 text-xl transition-all duration-200",
5151
"shadow-[0_2px_4px_rgba(0,0,0,0.3)]",
52-
"hover:bg-neutral-800 hover:border-neutral-800",
52+
"hover:bg-hover hover:border-border-light",
5353
"active:scale-95"
5454
)}
5555
>
@@ -69,7 +69,7 @@ export function LeftSidebar(props: LeftSidebarProps) {
6969
{/* Sidebar */}
7070
<div
7171
className={cn(
72-
"h-screen bg-neutral-800 border-r border-neutral-950 flex flex-col shrink-0",
72+
"h-screen bg-separator border-r border-border flex flex-col shrink-0",
7373
"transition-all duration-200 overflow-hidden relative z-[100]",
7474
collapsed ? "w-8" : "w-72",
7575
"max-md:fixed max-md:left-0 max-md:top-0 max-md:w-72 max-md:z-[1000]",

src/components/ProjectSidebar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ const DraggableProjectItemBase: React.FC<DraggableProjectItemProps> = ({
7878
<div
7979
ref={(node) => drag(drop(node))}
8080
className={cn(
81-
"py-1 px-3 flex items-center border-l-transparent transition-all duration-150 bg-neutral-900",
81+
"py-1 px-3 flex items-center border-l-transparent transition-all duration-150 bg-separator",
8282
isDragging ? "cursor-grabbing opacity-40 [&_*]:!cursor-grabbing" : "cursor-grab",
8383
isOver && "bg-sky-600/[0.08]",
84-
selected && "bg-neutral-800 border-l-accent",
85-
"hover:bg-neutral-800 hover:[&_button]:opacity-100 hover:[&_[data-drag-handle]]:opacity-100"
84+
selected && "bg-hover border-l-accent",
85+
"hover:bg-hover hover:[&_button]:opacity-100 hover:[&_[data-drag-handle]]:opacity-100"
8686
)}
8787
{...rest}
8888
>

src/components/RightSidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ const SidebarContainer: React.FC<SidebarContainerProps> = ({
4949
return (
5050
<div
5151
className={cn(
52-
"bg-neutral-800 border-l border-neutral-800 flex flex-col overflow-hidden flex-shrink-0",
52+
"bg-separator border-l border-border-light flex flex-col overflow-hidden flex-shrink-0",
5353
customWidth ? "" : "transition-[width] duration-200",
5454
collapsed && "sticky right-0 z-10 shadow-[-2px_0_4px_rgba(0,0,0,0.2)]",
55-
"max-md:border-l-0 max-md:border-t max-md:border-neutral-800",
55+
"max-md:border-l-0 max-md:border-t max-md:border-border-light",
5656
collapsed && "max-md:w-0 max-md:absolute max-md:bottom-0",
5757
!collapsed && "max-md:w-full max-md:relative max-md:max-h-[50vh]"
5858
)}

src/styles/globals.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
--color-git-dirty: hsl(38 92% 50%);
3232
--color-code-bg: hsl(0 6.43% 8.04%);
3333

34+
/* Sidebar Colors */
35+
--color-separator: hsl(0 0% 15%); /* #252526 - base sidebar bg */
36+
--color-hover: hsl(0 0% 16.5%); /* #2a2a2b - hover/selected states */
37+
38+
/* Borders */
39+
--color-border: hsl(0 0% 25%); /* #404040 - base borders */
40+
--color-border-light: hsl(0 0% 27%); /* #464647 - lighter borders */
41+
3442
/* Message Borders */
3543
--color-user-border: hsl(0 0% 38%);
3644
--color-assistant-border: hsl(207 45% 40%);

0 commit comments

Comments
 (0)