From 3f9841fb6d75bbf824512e911c05fd281d565273 Mon Sep 17 00:00:00 2001 From: M1kola Date: Wed, 26 Jul 2023 13:51:56 +0300 Subject: [PATCH] tracker fixes --- .../Common/ModalLayout/modalLayout.scss | 2 +- .../Modal/Tracker/ModalTicket/ModalTicket.jsx | 3 +- .../Tracker/ModalTicket/modalTicket.scss | 107 ++++++++++++++++-- .../TicketFullScreen/TicketFullScreen.jsx | 3 +- .../Tracker/TrackerModal/trackerModal.scss | 6 +- src/pages/Tracker/Tracker.js | 2 +- src/pages/Tracker/tracker.scss | 35 +++--- 7 files changed, 129 insertions(+), 29 deletions(-) diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index f64ff98f..f69ea676 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -15,7 +15,7 @@ position: relative; background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%); border-radius: 24px; - padding: 20px 40px 30px 40px; + padding: 35px 15px 15px 15px; display: flex; flex-direction: column; align-items: center; diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index ed830c61..b53ec3b7 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -487,7 +487,7 @@ export const ModalTiсket = ({ }} /> ) : ( -
{inputsValue.title}
+
{inputsValue.title}
)}
{editOpen ? ( @@ -518,6 +518,7 @@ export const ModalTiсket = ({ /> ) : (

)} diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 2a84bfb3..eaa6ae6d 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -115,6 +115,42 @@ margin-bottom: 0; } + .taskName { + max-width: 550px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; + } + + .taskDescription { + max-width: 550px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; + } + + .fullName { + max-width: 800px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; + } + + .fullDescription { + max-width: 800px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; + } + .comments__list { display: flex; flex-direction: column; @@ -318,13 +354,32 @@ .task__files { display: flex; flex-wrap: wrap; - gap: 10px; + column-gap: 25px; + row-gap: 20px; margin-top: 10px; + max-height: 350px; + overflow-y: auto; + + &::-webkit-scrollbar { + width: 5px; + border-radius: 10px; + } + + &::-webkit-scrollbar-thumb { + background: #cbd9f9; + border-radius: 20px; + } + + &::-webkit-scrollbar-track { + background: #c5c0c6; + border-radius: 20px; + } .taskFile { position: relative; .imgFile { - max-width: 180px; + max-width: 170px; + max-height: 104px; object-fit: contain; } @@ -665,7 +720,7 @@ } span { font-size: 12px; - color: #000000; + color: #1458DD; margin-left: 10px; font-weight: 500; } @@ -683,7 +738,8 @@ } .react-datepicker { - border: 1px solid #398208; + border: 1px solid #e8ede4; + border-radius: 8px; } .react-datepicker-popper { @@ -693,25 +749,58 @@ } .react-datepicker__current-month { - font-size: 14px; + font-size: 18px; font-family: "LabGrotesque", sans-serif; text-transform: capitalize; } + .react-datepicker__navigation-icon { + width: 20px; + height: 20px; + border-radius: 50px; + border: 2px solid #cbd1d2; + display: flex; + justify-content: center; + align-items: center; + + &:hover { + background-color: white; + } + } + + .react-datepicker__navigation-icon--next::before { + border-width: 2px 2px 0 0; + top: auto; + left: 4px; + height: 6px; + width: 6px; + } + + .react-datepicker__navigation-icon--previous::before { + border-width: 2px 2px 0 0; + top: auto; + left: 6px; + height: 6px; + width: 6px; + } + .react-datepicker__header { padding: 5px 0 10px; - border-bottom: 1px solid #398208; + border-bottom: 1px solid #baacc0; } .react-datepicker__day { - font-size: 14px; + font-size: 16px; width: 35px; font-family: "LabGrotesque", sans-serif; + border-radius: 50px; + padding: 7px; } .react-datepicker__day-name { - font-size: 14px; + font-size: 18px; width: 35px; + font-weight: 500; font-family: "LabGrotesque", sans-serif; } @@ -719,7 +808,7 @@ left: 85px !important; &:before { - border-bottom-color: #398208 !important; + border: 1px solid #e8ede4; } } } diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index c95e1e70..3b212611 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -626,7 +626,7 @@ export const TicketFullScreen = () => { }} /> ) : ( -

{inputsValue.title}
+
{inputsValue.title}
)}
{editOpen ? ( @@ -657,6 +657,7 @@ export const TicketFullScreen = () => { /> ) : (

{ return (

-

{task.title}

+

{task.title}