Saeed0920/inogen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

رفع تداخل

Browse Source
This commit is contained in:
mahmoodsht 2025-10-05 13:10:35 +03:30
parent ef97d8f9b6
commit bfb3fb74c5
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/components/dashboard/project-management/digital-innovation-page.tsx
View File

@ -599,12 +599,7 @@ export function DigitalInnovationPage() {
variant="ghost" variant="ghost"
size="sm" size="sm"
onClick={() => handleProjectDetails(item)} onClick={() => handleProjectDetails(item)}
<<<<<<< HEAD className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto">
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
>
جزئیات بیشتر جزئیات بیشتر
</Button> </Button>
); );

7
app/components/dashboard/project-management/green-innovation-page.tsx
View File

@ -602,12 +602,7 @@ export function GreenInnovationPage() {
variant="ghost" variant="ghost"
size="sm" size="sm"
onClick={() => handleProjectDetails(item)} onClick={() => handleProjectDetails(item)}
<<<<<<< HEAD className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto">
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
>
جزئیات بیشتر جزئیات بیشتر
</Button> </Button>
); );

7
app/components/dashboard/project-management/innovation-built-inside-page.tsx
View File

@ -624,12 +624,7 @@ export function InnovationBuiltInsidePage() {
variant="ghost" variant="ghost"
size="sm" size="sm"
onClick={() => handleProjectDetails(item)} onClick={() => handleProjectDetails(item)}
<<<<<<< HEAD className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto">
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
>
جزئیات بیشتر جزئیات بیشتر
</Button> </Button>
); );