From 7a5d6fc9ecac587b560321cb50cbe9b7966f85bd Mon Sep 17 00:00:00 2001
From: Victor Batischev <office@edoldnr.ru>
Date: Tue, 30 Jan 2024 18:28:57 +0300
Subject: [PATCH] fix tracker card

---
 .../Tracker/ModalTicket/modalTicket.scss      | 22 ++++++++--------
 .../ProfileCalendarComponent.jsx              |  8 +++---
 src/pages/Tracker/Tracker.jsx                 | 10 +++-----
 src/pages/Tracker/tracker.scss                | 25 +++++++++----------
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
index b971b46c..c0545033 100644
--- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
+++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
@@ -63,9 +63,10 @@
       color: #1458dd;
       font-weight: 700;
       font-size: 22px;
+      margin-left: 15px;
 
       &__category {
-        margin-right: 17px;
+        margin-right: 5px;
       }
 
       h2,
@@ -613,7 +614,7 @@
       cursor: pointer;
       position: absolute;
       top: 25px;
-      right: 30px;
+      right: 20px;
       width: 13px;
       height: 13px;
       display: flex;
@@ -654,8 +655,7 @@
       display: flex;
       align-items: center;
       position: relative;
-      margin-bottom: 5px;
-      margin-top: 12px;
+      margin-top: 10px;
 
       span {
         color: #000000;
@@ -688,7 +688,7 @@
 
     .start {
       font-size: 12px;
-      margin-top: 25px;
+      margin-top: 15px;
       width: 151px;
       height: 40px;
       border: none;
@@ -964,11 +964,11 @@
     }
 
     &_box {
-      padding: 25px 85px 25px 40px;
+      padding: 25px 0px 10px 40px;
       border-bottom: 1px solid #f1f1f1;
 
       &-middle {
-        padding: 0px 40px 25px 40px;
+        padding: 0px 0px 10px 35px;
         border-bottom: 1px solid #f1f1f1;
       }
 
@@ -978,8 +978,8 @@
           flex-direction: column;
           position: relative;
 
-          row-gap: 15px;
-          padding: 22px 40px 0 40px;
+          row-gap: 10px;
+          padding: 10px 40px 0px 40px;
           border-radius: 10px;
           margin-bottom: 10px;
 
@@ -1170,10 +1170,10 @@
       }
 
       &-bottom {
-        padding: 10px 110px 15px 56px;
+        padding: 0px 110px 10px 35px;
         font-weight: 400;
         font-size: 14px;
-        line-height: 38px;
+        line-height: 32px;
 
         div {
           display: flex;
diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx
index b1f468cd..204d2c8b 100644
--- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx
+++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx
@@ -273,15 +273,15 @@ export const ProfileCalendarComponent = React.memo(
                 ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
                 : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
               : activePeriod
-              ? "Выберите диапазон на календаре"
-              : "Выбрать диапазон"}
+                ? "Выберите диапазон на календаре"
+                : "Выбрать диапазон"}
           </span>
           <span>
             {totalRangeHours
               ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
               : endDate
-              ? "0 часов"
-              : ""}
+                ? "0 часов"
+                : ""}
           </span>
           {endDate && (
             <BaseButton
diff --git a/src/pages/Tracker/Tracker.jsx b/src/pages/Tracker/Tracker.jsx
index b5e877a7..a7e16e2f 100644
--- a/src/pages/Tracker/Tracker.jsx
+++ b/src/pages/Tracker/Tracker.jsx
@@ -233,9 +233,7 @@ export const Tracker = () => {
                   }}
                 >
                   <img src={addProjectImg} alt="#"></img>
-                  <p className="createProjectBtn__text">
-                    Добавить проект
-                  </p>
+                  <p className="createProjectBtn__text">Добавить проект</p>
                 </BaseButton>
               </>
             )}
@@ -320,11 +318,11 @@ export const Tracker = () => {
 
             <div className="taskList__end">
               <BaseButton styles={"close-day"}>
-                Закрыть сегоднящний день
+                Закрыть сегодняшний день
               </BaseButton>
               <p>
-                Нажимая кнопку - “Закрыть сегодняшний день” - вы отправляете
-                потрачеенное время на сверку
+                Нажимая кнопку “Закрыть сегодняшний день”, вы отправляете
+                потраченное время на сверку
               </p>
             </div>
           </div>
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index c1a0493a..0f119c4a 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -276,7 +276,7 @@
 
           &__add {
             display: flex;
-            margin: 0 15px 0 10px;
+            margin: 0 10px 0 15px;
 
             .button-add-column {
               width: 33px;
@@ -288,7 +288,7 @@
             }
 
             p {
-              margin-left: 14px;
+              margin-left: 5px;
               font-weight: 300;
               font-size: 14px;
               line-height: 17px;
@@ -521,7 +521,7 @@
                 margin: 0 10px;
                 column-gap: 5px;
                 cursor: pointer;
-                padding: 5px 20px;
+                padding: 5px;
                 border-radius: 8px;
                 border: 1px solid #e3e2e2;
                 max-height: 30px;
@@ -542,7 +542,7 @@
                   align-items: center;
                   justify-content: center;
                   display: flex;
-                  background: #cbd9f9;
+                  background: #99b4f3;
                   color: white;
                   font-size: 14px;
                   transition: all 0.15s ease;
@@ -798,7 +798,7 @@
 
           &__item {
             width: 328px;
-            padding: 16px;
+            padding: 4px 10px;
             position: relative;
             box-shadow: 0px 3px 2px -2px rgba(0, 0, 0, 0.06),
               0px 5px 3px -2px rgba(0, 0, 0, 0.02);
@@ -854,7 +854,7 @@
                 align-items: center;
                 justify-content: center;
                 font-size: 20px;
-                padding-bottom: 13px;
+                padding-bottom: 10px;
                 width: 24px;
                 height: 24px;
                 border: 1px solid #dddddd;
@@ -862,11 +862,11 @@
             }
 
             &__description {
-              margin: 8px 0 4px;
+              margin: 4px 0;
               color: #5c6165;
               font-weight: 400;
               font-size: 14px;
-              line-height: 140%;
+              line-height: 110%;
               max-height: 100px;
               overflow: hidden;
               text-overflow: ellipsis;
@@ -955,12 +955,11 @@
 
             &__executor {
               display: flex;
-              justify-content: space-between;
               align-items: center;
-              margin: 10px 0 15px;
-              padding-right: 10px;
+              margin-top: 2px;
               font-size: 14px;
               font-weight: 500;
+              column-gap: 5px;
 
               span {
                 max-width: 210px;
@@ -980,7 +979,7 @@
               flex-wrap: wrap;
               column-gap: 6px;
               row-gap: 3px;
-              margin: 5px 0 10px;
+              margin-bottom: 5px;
 
               .tagItem {
                 padding: 3px 10px;
@@ -1071,7 +1070,7 @@
               img {
                 width: 27px;
                 height: 27px;
-                margin-right: 17px;
+                margin-right: 5px;
               }
 
               p {