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

debag-conflict

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 {
@@ -174,11 +173,13 @@
       .executor {
         display: flex;
         justify-content: space-between;
-
         &:hover {
-          span {
-            font-weight: 600;
-          }
+          font-weight: 600;
+        }
+        span {
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
         }
       }
     }
@@ -222,7 +223,7 @@
     border-radius: 5px;
     cursor: pointer;
     position: relative;
-    min-width: 320px;
+    min-width: 240px;
     height: 42px;
     width: 100%;
 
@@ -235,6 +236,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 +257,7 @@
       overflow-y: auto;
       display: flex;
       flex-direction: column;
+      justify-content: center;
       position: absolute;
       width: 100%;
       padding: 9.5px 12px;
@@ -324,7 +336,7 @@
   }
 
   .create-task-body {
-    padding: 10px;
+    padding: 15px 20px;
     display: flex;
     column-gap: 20px;
 
@@ -360,8 +372,8 @@
       }
 
       .ck-editor__editable.ck-rounded-corners {
-        min-height: 130px;
-        max-height: 130px;
+        min-height: 150px;
+        max-height: 150px;
       }
     }
 
@@ -376,10 +388,10 @@
         align-items: center;
         column-gap: 9.5px;
         p {
-          color: #2d4a17;
-          font-size: 14px;
+          font-size: 18px;
           font-weight: 500;
           line-height: 32px;
+          padding-left: 15px;
         }
 
         img {
@@ -395,7 +407,7 @@
 
         .tags {
           &__selected {
-            width: 393px;
+            width: 250px;
             font-weight: 300;
             line-height: 18px;
             font-size: 15px;
@@ -526,7 +538,7 @@
 
         &__name {
           color: #000;
-          width: 393px;
+          width: 250px;
           height: 47px;
           font-size: 15px;
           font-weight: 400;
@@ -574,7 +586,7 @@
 
       .select__executor {
         background: #f1f1f1;
-        width: 393px;
+        width: 250px;
         height: 47px;
         font-weight: 300;
         line-height: 18px;
@@ -594,7 +606,7 @@
       &__dead-line {
         display: flex;
         align-items: center;
-        column-gap: 18px;
+        column-gap: 5px;
         font-weight: 300;
         line-height: 18px;
         font-size: 15px;
@@ -730,8 +742,7 @@
 }
 
 .add-person-btn {
-  margin: 0 auto 0 0;
-  margin-top: 20px;
+  margin: 0;
 }
 
 .modal-add.active {