fix: resolve merge conflict markers in sidebar and file tree components

Resolved all remaining git merge conflict markers (<<<<<<< HEAD / ======= / >>>>>>>)
across 5 files, choosing our Figma-exact values:
- CortexSidebarContainer: border-right #2E2F31
- CortexTreeItem: #2E2F31 hover/selected, 14px/400 text, 26px indent
- ExplorerTreeView: line-height 20px, padding 16px
- CortexFileExplorer: border #2E2F31, gap 0
- types.ts: TREE_INDENT_SIZE 26, TREE_BASE_PADDING 0

Author: echobt

src/components/cortex/CortexFileExplorer.tsx

@@ -107,14 +107,9 @@ export const CortexFileExplorer: Component<CortexFileExplorerProps> = (props) =>
     width: "320px",
     height: "100%",
     background: "#1C1C1D",
-<<<<<<< HEAD
-    border: "1px solid #2E2E31",
-    "border-radius": "12px",
-=======
     border: "1px solid #2E2F31",
     "border-radius": "12px",
     gap: "0",
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
     overflow: "hidden",
     "flex-shrink": "0",
     ...local.style,

src/components/cortex/explorer/ExplorerTreeView.tsx

@@ -94,11 +94,7 @@ export const ExplorerTreeView: Component<ExplorerTreeViewProps> = (props) => {
     "font-family": "Figtree, var(--cortex-font-sans, Inter, sans-serif)",
     "font-size": "16px",
     "font-weight": "600",
-<<<<<<< HEAD
     "line-height": "20px",
-=======
-    "line-height": "1em",
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
     color: "#E9E9EA",
   });
 
@@ -114,11 +110,7 @@ export const ExplorerTreeView: Component<ExplorerTreeViewProps> = (props) => {
     "flex-direction": "column",
     "align-self": "stretch",
     gap: "4px",
-<<<<<<< HEAD
     padding: "16px",
-=======
-    padding: "0 16px",
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
     flex: "1",
     "overflow-y": "auto",
     "overflow-x": "hidden",

src/components/cortex/layout/CortexSidebarContainer.tsx

@@ -76,11 +76,7 @@ export function CortexSidebarContainer(props: CortexSidebarContainerProps) {
     transition: props.isResizing ? "none" : "width 150ms ease, opacity 150ms ease",
     background: "#1C1C1D",
     "border-radius": "12px",
-<<<<<<< HEAD
-    border: "1px solid #2E2E31",
-=======
     "border-right": "1px solid #2E2F31",
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
     opacity: props.sidebarCollapsed ? "0" : "1",
     display: "flex",
     "flex-direction": "column",

src/components/cortex/primitives/CortexTreeItem.tsx

@@ -88,33 +88,12 @@ export const CortexTreeItem: Component<CortexTreeItemProps> = (props) => {
   const hasChildren = () => local.item.type === "folder" && local.item.children && local.item.children.length > 0;
 
   const indentPx = () => level() * 26;
-<<<<<<< HEAD
   const isFolder = () => local.item.type === "folder";
 
-  const getRowBackground = (): string => {
-    if (isPressed()) return "var(--cortex-bg-active, rgba(255, 255, 255, 0.08))";
-    if (local.isSelected) return "var(--cortex-interactive-selected, rgba(255, 255, 255, 0.05))";
-    if (isHovered()) return "var(--cortex-interactive-hover, rgba(255, 255, 255, 0.03))";
-    return "transparent";
-  };
-=======
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
-
   const rowStyle = (): JSX.CSSProperties => ({
     display: "flex",
     "align-items": "center",
     "align-self": "stretch",
-<<<<<<< HEAD
-    gap: isFolder() ? "8px" : "4px",
-    height: "20px",
-    padding: isFolder() ? `0 8px 0 ${indentPx()}px` : `0 8px 0 ${Math.max(0, level() - 1) * 26 + 28}px`,
-    cursor: "pointer",
-    background: getRowBackground(),
-    "border-radius": local.isSelected || isPressed() ? "4px" : "0",
-    transition: "background var(--cortex-transition-fast, 100ms ease)",
-    outline: "none",
-    "box-sizing": "border-box",
-=======
     gap: "8px",
     height: "20px",
     padding: "0",
@@ -127,7 +106,7 @@ export const CortexTreeItem: Component<CortexTreeItemProps> = (props) => {
       : "transparent",
     "border-radius": "4px",
     transition: "background 100ms ease",
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
+    outline: "none",
     ...local.style,
   });
 
@@ -161,13 +140,8 @@ export const CortexTreeItem: Component<CortexTreeItemProps> = (props) => {
     "font-family": "Figtree, var(--cortex-font-sans, Inter, sans-serif)",
     "font-size": "14px",
     "font-weight": "400",
-<<<<<<< HEAD
-    "line-height": "16px",
-    color: "#E9E9EA",
-=======
     "line-height": "1em",
-    color: local.item.type === "folder" ? "#E9E9EA" : "#E9E9EA",
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)
+    color: "#E9E9EA",
     "white-space": "nowrap",
     overflow: "hidden",
     "text-overflow": "ellipsis",

src/components/explorer/types.ts

@@ -191,10 +191,5 @@ export const ITEM_HEIGHT = 20;
 export const OVERSCAN = 10;
 export const DEBOUNCE_DELAY = 100;
 export const LAZY_LOAD_DEPTH = 1;
-<<<<<<< HEAD
-export const TREE_INDENT_SIZE = 16;
-export const TREE_BASE_PADDING = 16;
-=======
 export const TREE_INDENT_SIZE = 26;
 export const TREE_BASE_PADDING = 0;
->>>>>>> cf62f3c (fix: pixel-perfect sidebar container and file tree to match Figma design)