Merge branch 'main' of https://git.itguild.info/apuc/guild_front

debag-conflict

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

@@ -52,7 +52,7 @@
     position: relative;
     display: flex;
     flex-direction: column;
-    width: 600px;
+    width: 630px;
     margin: 26px 0 0 21px;
 
     .title-project {
@@ -100,10 +100,11 @@
     }
 
     &__task {
-      margin-top: -5px;
+      margin-top: -20px;
       padding: 18px;
       display: flex;
       flex-direction: column;
+      overflow-y: scroll;
 
       input {
         font-style: normal;
@@ -144,12 +145,9 @@
       }
 
       .task-name {
-        display: -webkit-box;
         max-width: 550px;
-        overflow: hidden;
         text-overflow: ellipsis;
         -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical;
       }
 
       .full-name {
@@ -613,8 +611,8 @@
     .exit {
       cursor: pointer;
       position: absolute;
-      top: 25px;
-      right: 20px;
+      top: 15px;
+      right: 15px;
       width: 13px;
       height: 13px;
       display: flex;
@@ -640,8 +638,8 @@
     span {
       font-family: "Inter", sans-serif;
       font-weight: 500;
-      font-size: 11px;
-      color: #807777;
+      font-size: 12px;
+      color: #666;
     }
 
     .nameProject {
@@ -661,7 +659,7 @@
         color: #000000;
         font-size: 12px;
         line-height: 32px;
-        margin-left: 17px;
+        margin-left: 10px;
         font-style: normal;
         font-weight: 400;
       }
@@ -849,8 +847,8 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
-      font-size: 12px;
-      margin-top: 10px;
+      font-size: 13px;
+      margin-top: 5px;
       width: 160px;
 
       p {
@@ -862,7 +860,7 @@
     &__creator {
       font-size: 14px;
       font-weight: 500;
-      color: #2d4a17;
+
       max-width: 200px;
       overflow: hidden;
       white-space: nowrap;
@@ -875,6 +873,7 @@
         line-height: 32px;
         font-weight: 500;
         display: flex;
+        color: #2d4a17;
       }
     }
 
@@ -964,11 +963,11 @@
     }
 
     &_box {
-      padding: 25px 0px 10px 40px;
+      padding: 25px 0px 10px 20px;
       border-bottom: 1px solid #f1f1f1;
 
       &-middle {
-        padding: 0px 0px 10px 35px;
+        padding: 0px 0px 10px 20px;
         border-bottom: 1px solid #f1f1f1;
       }
 
@@ -979,7 +978,7 @@
           position: relative;
 
           row-gap: 10px;
-          padding: 10px 40px 0px 40px;
+          padding: 10px 40px 0px 20px;
           border-radius: 10px;
           margin-bottom: 10px;
 
@@ -1110,7 +1109,7 @@
 
       &-priority {
         position: relative;
-        padding: 10px 40px 0 40px;
+        padding: 10px 40px 0 20px;
         border-radius: 10px;
         margin-bottom: 10px;
         .priority {
@@ -1170,7 +1169,7 @@
       }
 
       &-bottom {
-        padding: 0px 110px 10px 35px;
+        padding: 0px 90px 10px 35px;
         font-weight: 400;
         font-size: 14px;
         line-height: 32px;
@@ -1186,7 +1185,7 @@
           }
 
           p {
-            margin: 0 0 0 12px;
+            margin: 0 0 0 5px;
           }
         }