رفع تداخل
This commit is contained in:
parent
ef97d8f9b6
commit
bfb3fb74c5
|
|
@ -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">
|
||||
جزئیات بیشتر
|
||||
</Button>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
جزئیات بیشتر
|
||||
</Button>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
جزئیات بیشتر
|
||||
</Button>
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user