diff --git a/src/components/Calendar/calendarComponent.scss b/src/components/Calendar/calendarComponent.scss index e66d47e4..93579d20 100644 --- a/src/components/Calendar/calendarComponent.scss +++ b/src/components/Calendar/calendarComponent.scss @@ -173,7 +173,7 @@ .form-date { width: 100%; - padding: 5px 0 0 15px; + padding: 5px 0 0 0; height: 100%; } diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index 0a3c175e..3c2377e2 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -119,6 +119,10 @@ .create-ticket-project { padding: 0; background: white; + + @media (max-width: 770px) { + width: 90%; + } } .ck-editor { diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 890a6fd9..3c5b1758 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -30,10 +30,6 @@ max-height: 700px; max-width: 915px; - @media (max-width: 990px) { - width: 96%; - } - @media (max-width: 880px) { max-height: none; overflow-y: inherit; @@ -590,10 +586,6 @@ width: 100%; } } - - @media (max-width: 880px) { - width: 100%; - } } .members { @@ -613,6 +605,7 @@ position: relative; border-left: 1px solid #f1f1f1; width: 32%; + padding: 0 10px 10px 0; .exit { cursor: pointer; diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 3177638e..65385f7d 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -31,6 +31,12 @@ align-items: center; flex-direction: column; padding-bottom: 15px; + width: 100%; + min-width: 700px; + + @media (max-width: 770px) { + min-width: auto; + } .select-priority { background-color: white; @@ -338,8 +344,10 @@ } .create-task-body { + width: 100%; padding: 15px 30px; - display: flex; + display: grid; + grid-template-columns: 55% 45%; column-gap: 20px; &__left { @@ -356,7 +364,7 @@ .input-container { background: #f1f1f1; margin: 0 0 17px; - width: 393px; + width: 100%; height: 47px; input { @@ -407,10 +415,11 @@ display: flex; flex-direction: column; position: relative; + width: 100%; .tags { &__selected { - width: 250px; + width: 100%; font-weight: 300; line-height: 18px; font-size: 15px; @@ -538,10 +547,10 @@ .select__priority { position: relative; + width: 100%; &__name { color: #000; - width: 250px; height: 47px; font-size: 15px; font-weight: 400; @@ -589,7 +598,7 @@ .select__executor { background: #f1f1f1; - width: 250px; + width: 100%; height: 47px; font-weight: 300; line-height: 18px; diff --git a/src/components/ProfileCalendar/profileCalendar.scss b/src/components/ProfileCalendar/profileCalendar.scss index cf16b619..3349fe71 100644 --- a/src/components/ProfileCalendar/profileCalendar.scss +++ b/src/components/ProfileCalendar/profileCalendar.scss @@ -41,6 +41,12 @@ align-items: center; column-gap: 10px; + p { + @media (max-width: 425px) { + display: none; + } + } + div { font-size: 12px; font-weight: 400; diff --git a/src/components/TrackerCardTask/TrackerCardTask.jsx b/src/components/TrackerCardTask/TrackerCardTask.jsx index d04b2572..2be576de 100644 --- a/src/components/TrackerCardTask/TrackerCardTask.jsx +++ b/src/components/TrackerCardTask/TrackerCardTask.jsx @@ -97,85 +97,87 @@ const TrackerCardTask = forwardRef( }, [projectBoard]); return ( -
{task.title}
-{tag.slug}
-{task.title}
⚡
- - {priority[task.execution_priority]} - + + {Boolean(task.mark.length) && ( +{tag.slug}
+⌛
- - {getCorrectDate(task.dead_line)} - -⚡
+ + {priority[task.execution_priority]} + +⌛
+ + {getCorrectDate(task.dead_line)} + +