Skip to content
Snippets Groups Projects
Commit e7594933 authored by Richard Fernando Heise Ferreira's avatar Richard Fernando Heise Ferreira
Browse files

Merge branch 'issue-340/FIX-unformatted-notification' into 'develop'

Issue #340: FIX unformatted modal notification

See merge request !311
parents c49d0552 79cca999
No related branches found
No related tags found
1 merge request!311Issue #340: FIX unformatted modal notification
Pipeline #42496 passed
...@@ -91,17 +91,17 @@ export default function ItemNotification({ notification, postViewNotification }) ...@@ -91,17 +91,17 @@ export default function ItemNotification({ notification, postViewNotification })
/> />
} }
</div> </div>
<div> <div className="">
<p className="text-sm font-bold text-darkGray-HC-white line-clamp-1"> <p className="text-sm font-bold text-darkGray-HC-white line-clamp-1">
{notification.owner.name} {notification.owner.name} <br />
</p> </p>
<p className="text-sm font-normal text-darkGray-HC-white line-clamp-2 "> <p className="text-sm font-normal text-darkGray-HC-white line-clamp-2 ">
{tradutor(notification.activity)} {tradutor(notification.activity)}
<a className="text-turquoise-HC-underline -hover" href={`recurso/${notification.recipient?.id}`} > </p>
<a className=" text-sm text-turquoise-HC-underline -hover line-clamp-1" href={`recurso/${notification.recipient?.id}`} >
{notification.recipient?.name} {notification.recipient?.name}
</a> </a>
</p>
<p className="text-sm font-light text-darkGray-HC-white "> <p className="text-sm font-light text-darkGray-HC-white ">
{timeFunction(notification.created_at)} {timeFunction(notification.created_at)}
</p> </p>
......
...@@ -81,7 +81,7 @@ export default function ModalNotifications({ countNotifications, notifications, ...@@ -81,7 +81,7 @@ export default function ModalNotifications({ countNotifications, notifications,
<div className='flex pr-2' > <div className='flex pr-2' >
<div className='text-lg py-3 font-bold text-darkGray-HC-white pl-6 pr-16'> Notificações </div> <div className='text-lg py-3 font-bold text-darkGray-HC-white pl-6 pr-16'> Notificações </div>
<button className='text-darkGray-HC-white-underline text-sm bg-mediumGray-HC-dark rounded-xl px-2 h-10 mt-1 mr-1 hover:bg-mediumGray-HC-white hover:text-darkGray-HC-dark-underline outline outline-1 outline-ice-HC-white' onClick={setViewdAllNotification}> Marcar como lidas </button> <button className='text-darkGray-HC-white-underline text-sm bg-mediumGray-HC-dark rounded-xl px-2 h-10 mt-1 mr-1 hover:bg-mediumGray-HC-white hover:text-darkGray-HC-dark-underline outline outline-1 outline-ice-HC-white' onClick={setViewdAllNotification}> Marcar como lidas </button>
</div>t </div>
<div className='px-4'> <div className='px-4'>
<hr className='border-mediumGray-HC-white' /> <hr className='border-mediumGray-HC-white' />
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment