deps: resolve conflicts

This commit is contained in:
vamsi 2022-11-30 03:28:44 +05:30
commit 3b900c1d8b
45 changed files with 2340 additions and 600 deletions

View file

@ -19,7 +19,7 @@ const Button = React.forwardRef<HTMLButtonElement, Props>(
children,
onClick,
type = "button",
size = "rg",
size = "sm",
className,
theme = "primary",
disabled = false,
@ -36,12 +36,12 @@ const Button = React.forwardRef<HTMLButtonElement, Props>(
"inline-flex items-center rounded justify-center font-medium",
theme === "primary"
? `${
disabled ? "bg-indigo-700 hover:bg-indigo-800" : "bg-theme hover:bg-indigo-700"
disabled ? "opacity-70" : "bg-theme hover:bg-indigo-700"
} text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 border border-transparent`
: theme === "secondary"
? "border border-gray-300 bg-white"
: `${
disabled ? "bg-red-700 hover:bg-red-800" : "bg-red-600 hover:bg-red-700"
disabled ? "opacity-70" : "bg-red-600 hover:bg-red-700"
} text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 border border-transparent`,
size === "sm"
? "p-2 text-xs"

View file

@ -13,7 +13,7 @@ const SearchListbox: React.FC<Props> = ({
value,
multiple: canSelectMultiple,
icon,
width,
width = "sm",
optionsFontsize,
buttonClassName,
optionsClassName,
@ -83,7 +83,9 @@ const SearchListbox: React.FC<Props> = ({
>
<Combobox.Options
className={`absolute mt-1 bg-white shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 focus:outline-none max-h-32 overflow-auto z-10 ${
width === "sm"
width === "xs"
? "w-20"
: width === "sm"
? "w-32"
: width === "md"
? "w-48"

View file

@ -9,6 +9,6 @@ export type Props = {
icon?: JSX.Element;
buttonClassName?: string;
optionsClassName?: string;
width?: "sm" | "md" | "lg" | "xl" | "2xl";
width?: "xs" | "sm" | "md" | "lg" | "xl" | "2xl";
optionsFontsize?: "sm" | "md" | "lg" | "xl" | "2xl";
};

View file

@ -20,7 +20,7 @@ const Tooltip: React.FC<Props> = ({ children, content, position = "top" }) => {
: "top-14"
}`}
>
<p className="truncate text-sx">{content}</p>
<p className="truncate text-xs">{content}</p>
<span
className={`absolute w-2 h-2 bg-black ${
position === "top"