From bfb3fb74c59197f1b4a9f361ab2dece7ce1c6aa6 Mon Sep 17 00:00:00 2001 From: mahmoodsht <106068383+mahmoodsht@users.noreply.github.com> Date: Sun, 5 Oct 2025 13:10:35 +0330 Subject: [PATCH] =?UTF-8?q?=D8=B1=D9=81=D8=B9=20=D8=AA=D8=AF=D8=A7=D8=AE?= =?UTF-8?q?=D9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project-management/digital-innovation-page.tsx | 7 +------ .../dashboard/project-management/green-innovation-page.tsx | 7 +------ .../project-management/innovation-built-inside-page.tsx | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index e077d38..5ceb8ef 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -599,12 +599,7 @@ export function DigitalInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} -<<<<<<< HEAD - className="text-pr-green underline-offset-4 underline font-normal p-2 h-auto" -======= - className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" ->>>>>>> a14faab82da07fc3009ec8503f8bf6b143633a4c - > + className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"> جزئیات بیشتر ); diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index 552ac01..286b96d 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -602,12 +602,7 @@ export function GreenInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} -<<<<<<< HEAD - className="text-pr-green underline-offset-4 underline font-normal p-2 h-auto" -======= - className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" ->>>>>>> a14faab82da07fc3009ec8503f8bf6b143633a4c - > + className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"> جزئیات بیشتر ); diff --git a/app/components/dashboard/project-management/innovation-built-inside-page.tsx b/app/components/dashboard/project-management/innovation-built-inside-page.tsx index fcdaf7b..9a0702f 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -624,12 +624,7 @@ export function InnovationBuiltInsidePage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} -<<<<<<< HEAD - className="text-pr-green underline-offset-4 underline font-normal p-2 h-auto" -======= - className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto" ->>>>>>> a14faab82da07fc3009ec8503f8bf6b143633a4c - > + className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"> جزئیات بیشتر );