Skip to content

Commit 32dced5

Browse files
select z index fix and input box default length fix (#570)
* select z index fix and input box default length fix * z-index for shadcn-ui updated to default * fix: sidebar expand button overlap --------- Co-authored-by: BlankParticle <[email protected]>
1 parent 20e84d8 commit 32dced5

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

apps/web/src/app/[orgShortCode]/_components/sidebar-content.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default function SidebarContent() {
5959
return (
6060
<div
6161
className={cn(
62-
'bg-slate-3 border-slate-5 z-40 flex h-full w-full min-w-56 resize-x flex-col items-start gap-4 rounded-2xl border p-2'
62+
'bg-slate-3 border-slate-5 z-[1] flex h-full w-full min-w-56 resize-x flex-col items-start gap-4 rounded-2xl border p-2'
6363
)}>
6464
<OrgMenu />
6565
<div
@@ -177,7 +177,7 @@ function OrgMenu() {
177177
<CaretUpDown className={'h-4 w-4'} />
178178
</div>
179179
</DropdownMenuTrigger>
180-
<DropdownMenuContent className="bg-slate-1 border-slate-5 z-[101] flex w-[214px] flex-col gap-0 p-0">
180+
<DropdownMenuContent className="bg-slate-1 border-slate-5 flex w-[214px] flex-col gap-0 p-0">
181181
<DropdownMenuLabel className={'px-0 py-0'}>
182182
<div className="flex flex-col items-start justify-start gap-2 p-3">
183183
<span className={'text-slate-11 text-xs font-medium uppercase'}>
@@ -338,7 +338,7 @@ function OrgMenu() {
338338
</div>
339339
</DropdownMenuSubTrigger>
340340
<DropdownMenuPortal>
341-
<DropdownMenuSubContent className="z-[102]">
341+
<DropdownMenuSubContent>
342342
<DropdownMenuItem>
343343
<div
344344
className={

apps/web/src/app/[orgShortCode]/_components/sidebar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function Sidebar() {
3434
)}>
3535
<div
3636
className={cn(
37-
'absolute z-[100] m-0 flex h-full flex-row items-start justify-center gap-0 p-2 transition-all duration-1000 ease-in-out',
37+
'absolute m-0 flex h-full flex-row items-start justify-center gap-0 p-2 transition-all duration-1000 ease-in-out',
3838
!isSidebarAutoCollapsed && sidebarDocked
3939
? 'left-0 w-60 pr-0'
4040
: 'w-[252px] pr-3',
@@ -59,7 +59,7 @@ export default function Sidebar() {
5959
{!isSidebarAutoCollapsed && (
6060
<div
6161
className={cn(
62-
'bg-slate-3 focus-within:bg-slate-5 border-slate-5 absolute top-[34px] z-[90] flex h-6 w-4 max-w-4 cursor-pointer items-center justify-end overflow-visible rounded-br-[7px] rounded-tr-[7px] border border-l-0 transition-all duration-1000 ease-in-out',
62+
'bg-slate-3 focus-within:bg-slate-5 border-slate-5 absolute top-[34px] z-[1] flex h-6 w-4 max-w-4 cursor-pointer items-center justify-end overflow-visible rounded-br-[7px] rounded-tr-[7px] border border-l-0 transition-all duration-1000 ease-in-out',
6363
sidebarExpanded ? 'visible opacity-100' : 'invisible opacity-0',
6464
sidebarDocked ? '-right-[15px]' : '-right-[3px]'
6565
)}>
@@ -82,7 +82,7 @@ export default function Sidebar() {
8282
{isSidebarAutoCollapsed && (
8383
<div
8484
className={cn(
85-
'bg-slate-3 focus-within:bg-slate-5 border-slate-5 absolute -right-[19px] top-[26px] z-[90] flex h-10 w-8 max-w-8 cursor-pointer items-center justify-end overflow-visible rounded-br-[7px] rounded-tr-[7px] border border-l-0 transition-all duration-1000 ease-in-out',
85+
'bg-slate-3 focus-within:bg-slate-5 border-slate-5 absolute -right-[19px] top-[26px] flex h-10 w-8 max-w-8 cursor-pointer items-center justify-end overflow-visible rounded-br-[7px] rounded-tr-[7px] border border-l-0 transition-all duration-1000 ease-in-out',
8686
sidebarExpanded ? 'visible opacity-100' : 'invisible opacity-0'
8787
)}>
8888
<div

apps/web/src/app/[orgShortCode]/settings/org/users/teams/_components/new-team-modal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ export function NewTeamModal() {
163163
value={field.state.value ?? ''}
164164
onChange={(e) => field.handleChange(e.target.value)}
165165
onBlur={field.handleBlur}
166+
className="w-72"
166167
/>
167168
{field.state.meta.errorMap.onBlur && (
168169
<span className="text-red-10">

apps/web/src/components/avatar-plus.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function AvatarPlus({ size, users }: AvatarPlusProps) {
4343
</HoverCardTrigger>
4444
<HoverCardPortal>
4545
<HoverCardContent
46-
className="absolute z-50"
46+
className="absolute"
4747
side="right">
4848
<div className="flex gap-2">
4949
{rest.map((user) => (

apps/web/src/components/shadcn-ui/dialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const DialogOverlay = React.forwardRef<
1919
<DialogPrimitive.Overlay
2020
ref={ref}
2121
className={cn(
22-
'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-[500] bg-black/80',
22+
'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80',
2323
className
2424
)}
2525
{...props}
@@ -36,7 +36,7 @@ const DialogContent = React.forwardRef<
3636
<DialogPrimitive.Content
3737
ref={ref}
3838
className={cn(
39-
'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-[501] grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg',
39+
'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg',
4040
className
4141
)}
4242
{...props}>

apps/web/src/components/shadcn-ui/tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const TooltipContent = React.forwardRef<
1818
ref={ref}
1919
sideOffset={sideOffset}
2020
className={cn(
21-
'bg-base-12 text-base-1 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[1000] overflow-hidden rounded-md px-3 py-1.5 text-xs',
21+
'bg-base-12 text-base-1 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 overflow-hidden rounded-md px-3 py-1.5 text-xs',
2222
className
2323
)}
2424
{...props}

0 commit comments

Comments
 (0)