Skip to content
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.

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

fix(z-index): modified some values that where wrong #69

Merged
merged 1 commit into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/components/DropdownMenu/DropdownMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const DropdownMenuSubContent = React.forwardRef<
<DropdownMenuPrimitive.SubContent
ref={ref}
className={cn(
`z-50 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
`z-40 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
p-1 text-popover-foreground shadow-lg 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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
Expand All @@ -69,7 +69,7 @@ const DropdownMenuContent = React.forwardRef<
ref={ref}
sideOffset={sideOffset}
className={cn(
`z-50 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary
`z-40 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary
bg-white p-1 text-popover-foreground shadow-md`,
`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
Expand Down
4 changes: 2 additions & 2 deletions src/components/Menubar/Menubar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const MenubarSubContent = React.forwardRef<
<MenubarPrimitive.SubContent
ref={ref}
className={cn(
`z-50 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
`z-40 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
p-1 text-popover-foreground shadow-lg 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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
Expand All @@ -104,7 +104,7 @@ const MenubarContent = React.forwardRef<
alignOffset={alignOffset}
sideOffset={sideOffset}
className={cn(
`z-50 min-w-[12rem] overflow-hidden rounded-md border-2 border-primary
`z-40 min-w-[12rem] overflow-hidden rounded-md border-2 border-primary
bg-white p-1 text-popover-foreground shadow-md data-[state=open]:animate-in
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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
Expand Down
2 changes: 1 addition & 1 deletion src/components/PopupModal/PopupModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const PopupModal = forwardRef<HTMLDivElement, IPopupModalProps>(
...rest
} = props;
const [hidden, setHidden] = useState(status);
const fullModeClass = fullMode ? 'fixed top-0 left-0 right-0 z-30' : '';
const fullModeClass = fullMode ? 'fixed top-0 left-0 right-0 z-50' : 'z-50';

useEffect(() => {
handleOpen();
Expand Down
2 changes: 1 addition & 1 deletion src/components/Tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function Tooltip(props: TooltipProps) {
{clonedIcon}
<span className="ml-2 text-neutral">{children}</span>
<div
className={`w-fit z-10 absolute bg-tertiary p-3 rounded-md text-neutral opacity-0transition-opacity
className={`w-fit z-50 absolute bg-tertiary p-3 rounded-md text-neutral opacity-0transition-opacity
duration-300 ${showTooltip ? 'opacity-90' : 'opacity-0'}
${customClass} ${placementClasses[placement]}`}
>
Expand Down
Loading