Fixed styles in tracker

src/components/Modal/ModalSelect/modalSelect.scss

@@ -19,6 +19,10 @@
         img {
           margin-right: 12px;
         }
+
+        p:hover {
+          text-decoration: underline;
+        }
       }
     }
 

src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx

@@ -314,16 +314,17 @@ export const ModalTiсket = ({
         onClick={(e) => e.stopPropagation()}
       >
         <div className="content">
-          <h3 className="title-project">
+          <Link to={`/tracker/task/${task.id}`} className="title-project__full">
-            <img src={category} className="title-project__category"></img>
-            Проект: {projectName}
-            <Link
-              to={`/tracker/task/${task.id}`}
-              className="title-project__full"
-            >
             <img src={fullScreen}></img>
           </Link>
-          </h3>
+
+          <div className="title-project">
+            <img src={category} className="title-project__category"></img>
+            <h2>
+              Проект:
+              <h3>{projectName}</h3>
+            </h2>
+          </div>
 
           <div className="content__task">
             <span>Задача</span>

src/components/Modal/Tracker/ModalTicket/modalTicket.scss

@@ -17,32 +17,53 @@
 
 .modal-tiket__content {
   background: #ffffff;
-  //border: 1px solid #dde2e4;
   border-radius: 8px;
   display: flex;
   flex-direction: row;
 
   .content {
+    position: relative;
     display: flex;
     flex-direction: column;
     width: 600px;
     margin: 26px 0 0 21px;
 
     .title-project {
-      color: #1458dd;
+      max-width: 85%;
-      font-family: "LabGrotesque", sans-serif;
       display: flex;
       align-items: center;
-      font-weight: 700;
-      font-size: 22px;
-      line-height: 32px;
 
       &__category {
         margin-right: 17px;
       }
 
+      h2,
+      h3 {
+        font-weight: 700;
+        font-size: 22px;
+        line-height: 32px;
+        color: #1458dd;
+        margin: 0;
+        font-family: "LabGrotesque", sans-serif;
+      }
+
+      h2 {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        flex-direction: row;
+
+        h3 {
+          margin-left: 5px;
+          word-break: break-all;
+        }
+      }
+
       &__full {
-        margin-left: 35%;
+        position: absolute;
+        position: absolute;
+        right: 28px;
+        top: 0;
       }
     }
 

src/components/ProjectTiket/projectTiket.scss

@@ -6,6 +6,12 @@
   padding: 17px 26px 16px;
   cursor: pointer;
   max-width: 440px;
+  transition: 0.4s;
+
+  &:hover {
+    transition: 0.4s;
+    box-shadow: 4px 4px 8px 0px rgba(34, 60, 80, 0.11);
+  }
 
   @media (max-width: 1068px) {
     width: 47%;

src/pages/Tracker/Tracker.js

@@ -14,6 +14,7 @@ import { urlForLocal } from "@utils/helper";
 import { apiRequest } from "@api/request";
 
 import { getCorrectDate } from "@components/Calendar/calendarHelper";
+import BaseButton from "@components/Common/BaseButton/BaseButton";
 import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
@@ -190,15 +191,16 @@ export const Tracker = () => {
                       <img src={noProjects} alt="noProjectImg" />
                       <p>Создайте свой первый проект</p>
                     </div>
-                    <button
+
-                      className="createProjectBtn"
+                    <BaseButton
+                      styles={"createProjectBtn"}
                       onClick={() => {
                         dispatch(modalToggle("createProject"));
                         setModalCreateProject(true);
                       }}
                     >
                       <span>+</span>Создать проект
-                    </button>
+                    </BaseButton>
                   </div>
                   <p className="no-projects__info">
                     Ставьте задачи, следите за прогрессом, ведите учёт рабочего
@@ -208,15 +210,15 @@ export const Tracker = () => {
               )}
             {Boolean(projects.length) && !loader && (
               <div className="create-newProject">
-                <button
+                <BaseButton
-                  className="createProjectBtn"
+                  styles="createProjectBtn"
                   onClick={() => {
                     dispatch(modalToggle("createProject"));
                     setModalCreateProject(true);
                   }}
                 >
                   <span>+</span>Создать проект
-                </button>
+                </BaseButton>
                 <p>
                   Ставьте задачи, следите за прогрессом, ведите учёт рабочего
                   времени

src/pages/Tracker/tracker.scss

@@ -142,8 +142,6 @@
                 margin-left: 17px;
               }
             }
-            button {
-            }
           }
 
           &__info {
@@ -155,16 +153,11 @@
         }
 
         .createProjectBtn {
-          background: #52b709;
-          border-radius: 44px;
           max-width: 188px;
           height: 50px;
           width: 100%;
-          border: none;
           font-weight: 400;
           font-size: 15px;
-          line-height: 32px;
-          color: #ffffff;
           display: flex;
           align-items: center;
           justify-content: center;
@@ -228,6 +221,8 @@
             font-size: 22px;
             line-height: 32px;
             margin-bottom: 0;
+            max-width: 30%;
+            word-break: break-all;
           }
 
           &__add {
@@ -321,8 +316,9 @@
 
               &__close {
                 cursor: pointer;
-                width: 8px;
+                position: absolute;
-                height: 8px;
+                right: 20px;
+                top: 15px;
                 margin-left: auto;
               }
 
@@ -395,8 +391,8 @@
 
                 .delete {
                   cursor: pointer;
-                  width: 14px;
+                  width: 20px;
-                  height: 14px;
+                  height: 20px;
                 }
               }
 
@@ -770,6 +766,10 @@
               max-width: 450px;
               width: 100%;
 
+              &:focus-within {
+                border: 1px solid #0000004d;
+              }
+
               @media (max-width: 690px) {
                 max-width: 350px;
               }
@@ -833,8 +833,15 @@
               border-radius: 12px;
               padding: 12px 42px 7px 32px;
               justify-content: space-between;
+              transition: 0.4s;
               cursor: pointer;
 
+              &:hover {
+                transform: scale(0.99);
+                box-shadow: 4px 4px 8px 0px rgba(34, 60, 80, 0.11);
+                transition: 0.4s;
+              }
+
               &__info {
                 display: flex;
                 flex-direction: column;
@@ -967,9 +974,12 @@
             background: #f1f1f1;
             border-radius: 12px;
             padding: 12px 42px 7px 32px;
+            transition: 0.4s;
 
             &:hover {
-              background: var(--ds-background-neutral-subtle-hovered, #f4f5f7);
+              transform: scale(0.99);
+              box-shadow: 4px 4px 8px 0px rgba(34, 60, 80, 0.11);
+              transition: 0.4s;
             }
 
             p {
@@ -1046,6 +1056,10 @@
               max-width: 300px;
               width: 100%;
 
+              &:focus-within {
+                border: 1px solid #0000004d;
+              }
+
               @media (max-width: 590px) {
                 max-width: 230px;
               }