From f738805d1e6b20dd50d44fb067fb0c71224e3551 Mon Sep 17 00:00:00 2001
From: Victor Batischev <office@edoldnr.ru>
Date: Thu, 8 Feb 2024 19:53:39 +0300
Subject: [PATCH] fix styles

---
 .../Common/ModalLayout/modalLayout.scss         | 15 +++++++--------
 .../Tracker/ListEmployees/ListEmployees.jsx     |  2 +-
 .../Modal/Tracker/ModalTicket/ModalTicket.jsx   |  7 ++-----
 .../Modal/Tracker/ModalTicket/modalTicket.scss  |  3 ++-
 .../TicketFullScreen/TicketFullScreen.jsx       |  4 ++--
 .../TicketFullScreen/ticketFullScreen.scss      |  1 -
 .../Modal/Tracker/TrackerModal/TrackerModal.jsx |  8 ++++----
 .../Tracker/TrackerModal/trackerModal.scss      | 17 +++++++++++++----
 src/components/features/quiz/quiz.scss          |  5 -----
 src/pages/ProjectTracker/ProjectTracker.js      |  4 +++-
 src/pages/Statistics/Statistics.jsx             |  2 +-
 src/pages/Tracker/tracker.scss                  |  3 +--
 12 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss
index b803a061..2c0ef01f 100644
--- a/src/components/Common/ModalLayout/modalLayout.scss
+++ b/src/components/Common/ModalLayout/modalLayout.scss
@@ -23,6 +23,8 @@
 
     .select-person {
       align-items: start;
+      margin: 0;
+      padding: 0;
 
       &__info {
         font-size: 15px;
@@ -49,19 +51,17 @@
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-
-        button {
-          // margin: 0 auto;
-        }
+        align-items: center;
       }
 
       .invite-person-block {
         display: flex;
         flex-direction: column;
-        row-gap: 20px;
+        align-items: center;
+        row-gap: 10px;
         &__input {
           margin: 0;
-          min-width: 320px;
+          min-width: 240px;
           height: 42px;
 
           input {
@@ -75,7 +75,7 @@
 
         &__btn {
           margin: 0;
-          max-width: 242px;
+          max-width: 190px;
           width: 100%;
         }
       }
@@ -106,7 +106,6 @@
       display: flex;
       flex-direction: column;
       row-gap: 10px;
-      padding: 19px 10px 29px 10px;
 
       @media (max-width: 500px) {
         padding: 10px;
diff --git a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
index a9fefcb4..e35689a9 100644
--- a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
+++ b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
@@ -87,7 +87,7 @@ const ListEmployees = ({
           }}
         >
           <span className="add-person">+</span>
-          <p>Добавить участников</p>
+          <p>Добавить участника</p>
         </div>
       </div>
     </ModalLayout>
diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
index d634ff6b..5f976cb2 100644
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@@ -758,8 +758,7 @@ export const ModalTiсket = ({
         <div className="workers">
           <div className="workers_box task__info">
             <span className="exit" onClick={() => setActive(false)}></span>
-            <p className="workers__creator">Создатель: {task.user?.fio}</p>
-
+            Создатель: <p className="workers__creator">{task.user?.fio}</p>
             {executor ? (
               <>
                 <h5>Исполнитель: </h5>
@@ -819,7 +818,6 @@ export const ModalTiсket = ({
                 )}
               </div>
             )}
-
             {Boolean(members.length) && (
               <div className="members">
                 <h5>Участники:</h5>
@@ -847,7 +845,6 @@ export const ModalTiсket = ({
                 </div>
               </div>
             )}
-
             <div className="add-worker moreItems">
               <button
                 className="button-add-worker"
@@ -855,7 +852,7 @@ export const ModalTiсket = ({
               >
                 +
               </button>
-              <span>Добавить участников</span>
+              <span>Добавить участника</span>
               {dropListMembersOpen && (
                 <div className="dropdownList">
                   <img
diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
index e08457a5..f55bed57 100644
--- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
+++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
@@ -860,7 +860,7 @@
     &__creator {
       font-size: 14px;
       font-weight: 500;
-      color: #2d4a17;
+      
       max-width: 200px;
       overflow: hidden;
       white-space: nowrap;
@@ -873,6 +873,7 @@
         line-height: 32px;
         font-weight: 500;
         display: flex;
+        color: #2d4a17;
       }
     }
 
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 803aa2c0..51fd416c 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -812,7 +812,7 @@ export const TicketFullScreen = () => {
               <div className="workers fullScreenWorkers">
                 <div className="workers_box task__info">
                   <div className="workers__creator">
-                    Создатель: <p>&nbsp;{taskInfo.user?.fio}</p>
+                    Создатель: <p>{taskInfo.user?.fio}</p>
                   </div>
 
                   {taskInfo.executor ? (
@@ -908,7 +908,7 @@ export const TicketFullScreen = () => {
                     >
                       +
                     </button>
-                    <span>Добавить участников</span>
+                    <span>Добавить участника</span>
                     {dropListMembersOpen && (
                       <div className="dropdownList">
                         <img
diff --git a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
index 525dd6e9..907bcf27 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
+++ b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss
@@ -62,7 +62,6 @@
         .workers__creator {
           margin-bottom: 0 !important;
           display: flex;
-
         }
 
         .add-worker {
diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
index c918c9d6..3f68f9e9 100644
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@@ -407,7 +407,7 @@ export const TrackerModal = ({
             <div className="title-project select-person">
               <h4>Добавьте участника</h4>
               <p className="select-person__info">
-                Выберите пользователя в проекте или добавьте по e-mail
+                Выберите пользователя в списке или добавьте по e-mail
               </p>
               <div className="invite__blocks">
                 <div className="add-person-block">
@@ -440,7 +440,7 @@ export const TrackerModal = ({
                                   setSelectedWorker(worker);
                                 }}
                               >
-                                <p>{worker.employee.fio}</p>
+                                <span>{worker.employee.fio}</span>
                                 <img
                                   src={urlForLocal(worker.employee.avatar)}
                                   alt="avatar"
@@ -473,10 +473,10 @@ export const TrackerModal = ({
                     />
                   </div>
                   <BaseButton
-                    styles={"button-add invite-person-block__btn"}
+                    styles={"button-add add-person-btn"}
                     onClick={inviteUserByEmail}
                   >
-                    Отправить приглашение
+                    Пригласить
                   </BaseButton>
                 </div>
               </div>
diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
index 5d7560ba..bac1f01c 100644
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@@ -30,7 +30,6 @@
   display: flex;
   align-items: center;
   flex-direction: column;
-  row-gap: 12px;
   padding-bottom: 15px;
 
   .select-priority {
@@ -222,7 +221,7 @@
     border-radius: 5px;
     cursor: pointer;
     position: relative;
-    min-width: 320px;
+    min-width: 240px;
     height: 42px;
     width: 100%;
 
@@ -235,6 +234,16 @@
       margin-left: 10px;
     }
 
+    span {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      font-size: 13px;
+      max-width: 270px;
+      margin: 0;
+      font-weight: 400;
+    }
+
     img {
       transition: all 0.3s ease;
       width: 20px;
@@ -246,6 +255,7 @@
       overflow-y: auto;
       display: flex;
       flex-direction: column;
+      justify-content: center;
       position: absolute;
       width: 100%;
       padding: 9.5px 12px;
@@ -730,8 +740,7 @@
 }
 
 .add-person-btn {
-  margin: 0 auto 0 0;
-  margin-top: 20px;
+  margin: 0;
 }
 
 .modal-add.active {
diff --git a/src/components/features/quiz/quiz.scss b/src/components/features/quiz/quiz.scss
index d343d23e..3fa2e2b5 100644
--- a/src/components/features/quiz/quiz.scss
+++ b/src/components/features/quiz/quiz.scss
@@ -520,7 +520,6 @@ $maxWidthContainer: 1123;
 .block-completed-test {
   background: #ffffff;
   border-radius: 12px;
-  // .block-completed-test__container
 
   &__container {
     padding: 41px 35px 29px 59px;
@@ -529,8 +528,6 @@ $maxWidthContainer: 1123;
     flex-wrap: wrap;
   }
 
-  // .block-completed-test__img
-
   &__img {
     flex: 0 0 54px;
     height: 60px;
@@ -542,8 +539,6 @@ $maxWidthContainer: 1123;
     }
   }
 
-  // .block-completed-test__title
-
   &__title {
     font-weight: 700;
     font-size: 18px;
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index 2fab3efd..67feda43 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -528,7 +528,9 @@ export const ProjectTracker = () => {
                       </div>
                     )}
                     {projectBoard.projectUsers?.length > 3 && (
-                      <span className="countPersons">+1</span>
+                      <span className="countPersons">
+                        +{projectBoard.projectUsers?.length - 3}
+                      </span>
                     )}
                     <span
                       className="add-person"
diff --git a/src/pages/Statistics/Statistics.jsx b/src/pages/Statistics/Statistics.jsx
index c37f59b4..7699d1b4 100644
--- a/src/pages/Statistics/Statistics.jsx
+++ b/src/pages/Statistics/Statistics.jsx
@@ -191,7 +191,7 @@ const Statistics = () => {
                 </div>
                 <div className="add-person">
                   <span className="add-person__button">+</span>
-                  <p>Добавить участников</p>
+                  <p>Добавить участника</p>
                 </div>
               </div>
             </div>
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index e94e40b8..6bae419d 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -124,8 +124,7 @@
     &__content {
       width: 100%;
       background: #ffffff;
-      padding: 30px 0;
-      margin-bottom: 10px;
+      padding-top: 20px;
 
       &__wrapper {
         max-width: 1160px;