Skip to content

fix labels hover and wrap labels inside a fixed div to enhance sidebar #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrgSub merged 2 commits into from
May 22, 2025
+3 −3
Merged

fix labels hover and wrap labels inside a fixed div to enhance sidebar #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e2f5f3
fix labels hover and wrap labels inside a fixed div to enhance sideba…
Adarsh9977 May 22, 2025
713e9f2
Merge branch 'staging' into label-sidebar
Adarsh9977 May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/mail/components/magicui/file-tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ const Folder = forwardRef<HTMLDivElement, FolderProps & React.HTMLAttributes<HTM
<Accordion.Item {...props} value={value} className="relative h-full overflow-hidden">
<div
className={cn(
`hover:bg-sidebar-accent-foreground flex items-center gap-1 rounded-lg px-2 py-1.5 text-sm dark:hover:bg-[#202020]`,
`hover:bg-subtleWhite flex items-center gap-1 rounded-lg px-2 py-1.5 text-sm dark:hover:bg-[#202020]`,
className,
{
'bg-muted rounded-md': isSelect && isSelectable,
'bg-sidebar-accent rounded-md': isSelect && isSelectable,
'cursor-pointer': isSelectable,
'cursor-not-allowed opacity-50': !isSelectable,
},
Expand Down
2 changes: 1 addition & 1 deletion apps/mail/components/ui/nav-main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ export function NavMain({ items }: NavMainProps) {
</div>

<div className="mr-0 flex-1 pr-0">
<div className="bg-background relative -m-2 flex-1 overflow-auto">
<div className="bg-background relative -m-2 flex-1 max-h-48 overflow-auto hide-scrollbar">
<Tree className="bg-background rounded-md">
{(() => {
if (!data) return null;
Expand Down