awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-09 20:28:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cx -> twMerge

Browse Source
This commit is contained in:
Daniel Hougaard
2024-02-22 05:00:26 +01:00
parent c1c66da92b
commit 9ce71371a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
+2 -2
View File
@@ -9,7 +9,7 @@ import {
faXmarkCircle faXmarkCircle
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { cx } from "cva"; import { twMerge } from "tailwind-merge";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider"; import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import { Button, ContentLoader, EmptyState, IconButton, Tooltip } from "@app/components/v2"; import { Button, ContentLoader, EmptyState, IconButton, Tooltip } from "@app/components/v2";
@@ -172,7 +172,7 @@ export const SecretApprovalRequestChanges = ({
<FontAwesomeIcon icon={faArrowLeft} /> <FontAwesomeIcon icon={faArrowLeft} />
</IconButton> </IconButton>
<div <div
className={cx( className={twMerge(
"flex items-center space-x-2 rounded-3xl px-4 py-2 text-white", "flex items-center space-x-2 rounded-3xl px-4 py-2 text-white",
secretApprovalRequestDetails.status === "close" ? "bg-red-600" : "bg-green-600" secretApprovalRequestDetails.status === "close" ? "bg-red-600" : "bg-green-600"
)} )}