Compare commits
No commits in common. "dfd1a46694c91c79de207fd743e9c3855b7eda11" and "6ec8e5f2a23ef13e36827c7d92a1a14cf8aae012" have entirely different histories.
dfd1a46694
...
6ec8e5f2a2
@ -1,4 +1,3 @@
|
||||
import { Button } from '@headlessui/react'
|
||||
import type { CSSProperties, MouseEventHandler, ReactNode } from 'react'
|
||||
import { twMerge } from 'tailwind-merge'
|
||||
|
||||
@ -17,12 +16,12 @@ export const EditorButton = (properties: TProperties) => {
|
||||
properties
|
||||
|
||||
return (
|
||||
<Button
|
||||
<button
|
||||
type="button"
|
||||
onClick={onClick}
|
||||
disabled={disabled}
|
||||
className={twMerge(
|
||||
'flex h-6 w-8 cursor-pointer items-center justify-center rounded-md p-2 text-black hover:bg-[#2E2F7C] hover:text-white active:bg-[#2E2F7C]/50 disabled:cursor-not-allowed disabled:bg-[#2E2F7C]/50 disabled:text-white disabled:opacity-50',
|
||||
'flex h-6 w-8 cursor-pointer items-center justify-center rounded-md p-2 hover:bg-[#2E2F7C] hover:text-white disabled:cursor-not-allowed disabled:bg-[#2E2F7C]/50 disabled:text-white disabled:opacity-50',
|
||||
isActive ? 'bg-[#2E2F7C]/10' : '',
|
||||
className,
|
||||
)}
|
||||
@ -30,6 +29,6 @@ export const EditorButton = (properties: TProperties) => {
|
||||
title={title}
|
||||
>
|
||||
{children}
|
||||
</Button>
|
||||
</button>
|
||||
)
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ export const Sidebar = () => {
|
||||
key={`${group}-${title}`}
|
||||
className={twMerge(
|
||||
path === url ? 'bg-[#707FDD]/10 font-bold' : '',
|
||||
'group/menu flex h-[42px] w-[200px] items-center gap-x-3 rounded-md px-5 transition hover:bg-[#707FDD]/10 active:bg-[#707FDD]/20',
|
||||
'group/menu flex h-[42px] w-[200px] items-center gap-x-3 rounded-md px-5 transition-all hover:bg-[#707FDD]/10',
|
||||
)}
|
||||
>
|
||||
<Icon
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user