Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

style(layout): hover styles for nested drive (#6456)

Seamuscbbd06d828c4
diff --git a/apps/web/src/features/drive-view/components/folder-tree.tsx b/apps/web/src/features/drive-view/components/folder-tree.tsx
index d610312955..d52538bbac 100644
--- a/apps/web/src/features/drive-view/components/folder-tree.tsx
+++ b/apps/web/src/features/drive-view/components/folder-tree.tsx
@@ -35,7 +35,7 @@ export function FolderTree(props: {
variant="ghost"
size="sm"
square
- class="size-6 shrink-0 rounded-lg not-disabled:hover:bg-transparent not-disabled:hover:bg-none not-disabled:active:bg-none"
+ class="size-6 shrink-0 rounded-lg not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none"
aria-label={`${open() ? 'Collapse' : 'Expand'} ${node.name}`}
aria-expanded={open()}
onClick={() => props.onToggle(node.id)}
@@ -50,7 +50,7 @@ export function FolderTree(props: {
</Show>
<ViewSidebar.Item
class={cn(
- 'min-w-0 flex-1 justify-start px-2 font-normal bg-transparent not-disabled:hover:bg-transparent not-disabled:hover:bg-none not-disabled:active:bg-none',
+ 'min-w-0 flex-1 justify-start px-2 font-normal bg-transparent not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none',
props.selectedId === node.id && 'text-ink'
)}
title={node.name}
diff --git a/apps/web/src/features/drive-view/views/drive-layout.tsx b/apps/web/src/features/drive-view/views/drive-layout.tsx
index 485c940b04..98d3da2fd4 100644
--- a/apps/web/src/features/drive-view/views/drive-layout.tsx
+++ b/apps/web/src/features/drive-view/views/drive-layout.tsx
@@ -130,7 +130,7 @@ export function DriveLayout(props: {
variant="ghost"
size="sm"
square
- class="size-6 shrink-0 rounded-lg not-disabled:hover:bg-transparent not-disabled:hover:bg-none not-disabled:active:bg-none"
+ class="size-6 shrink-0 rounded-lg not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none"
aria-label={
props.state.rootOpen
? 'Collapse Drive folders'
@@ -148,7 +148,7 @@ export function DriveLayout(props: {
</Button>
<ViewSidebar.Item
class={cn(
- 'min-w-0 flex-1 px-2 font-normal bg-transparent not-disabled:hover:bg-transparent not-disabled:hover:bg-none not-disabled:active:bg-none',
+ 'min-w-0 flex-1 px-2 font-normal bg-transparent not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none',
selectedFolder() === null && 'text-ink'
)}
aria-current={selectedFolder() === null ? 'page' : undefined}