diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index b803a061..2c0ef01f 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -23,6 +23,8 @@ .select-person { align-items: start; + margin: 0; + padding: 0; &__info { font-size: 15px; @@ -49,19 +51,17 @@ display: flex; flex-direction: column; justify-content: space-between; - - button { - // margin: 0 auto; - } + align-items: center; } .invite-person-block { display: flex; flex-direction: column; - row-gap: 20px; + align-items: center; + row-gap: 10px; &__input { margin: 0; - min-width: 320px; + min-width: 240px; height: 42px; input { @@ -75,7 +75,7 @@ &__btn { margin: 0; - max-width: 242px; + max-width: 190px; width: 100%; } } @@ -106,7 +106,6 @@ display: flex; flex-direction: column; row-gap: 10px; - padding: 19px 10px 29px 10px; @media (max-width: 500px) { padding: 10px; diff --git a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx index a9fefcb4..e35689a9 100644 --- a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx +++ b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx @@ -87,7 +87,7 @@ const ListEmployees = ({ }} > + -

Добавить участников

+

Добавить участника

diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index d634ff6b..5f976cb2 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -758,8 +758,7 @@ export const ModalTiсket = ({
setActive(false)}> -

Создатель: {task.user?.fio}

- + Создатель:

{task.user?.fio}

{executor ? ( <>
Исполнитель:
@@ -819,7 +818,6 @@ export const ModalTiсket = ({ )}
)} - {Boolean(members.length) && (
Участники:
@@ -847,7 +845,6 @@ export const ModalTiсket = ({
)} -
- Добавить участников + Добавить участника {dropListMembersOpen && (
{
- Создатель:

 {taskInfo.user?.fio}

+ Создатель:

{taskInfo.user?.fio}

{taskInfo.executor ? ( @@ -908,7 +908,7 @@ export const TicketFullScreen = () => { > + - Добавить участников + Добавить участника {dropListMembersOpen && (

Добавьте участника

- Выберите пользователя в проекте или добавьте по e-mail + Выберите пользователя в списке или добавьте по e-mail

@@ -440,7 +440,7 @@ export const TrackerModal = ({ setSelectedWorker(worker); }} > -

{worker.employee.fio}

+ {worker.employee.fio} avatar
- Отправить приглашение + Пригласить
diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 5d7560ba..bac1f01c 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/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 { @@ -222,7 +221,7 @@ border-radius: 5px; cursor: pointer; position: relative; - min-width: 320px; + min-width: 240px; height: 42px; width: 100%; @@ -235,6 +234,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 +255,7 @@ overflow-y: auto; display: flex; flex-direction: column; + justify-content: center; position: absolute; width: 100%; padding: 9.5px 12px; @@ -730,8 +740,7 @@ } .add-person-btn { - margin: 0 auto 0 0; - margin-top: 20px; + margin: 0; } .modal-add.active { diff --git a/src/components/features/quiz/quiz.scss b/src/components/features/quiz/quiz.scss index d343d23e..3fa2e2b5 100644 --- a/src/components/features/quiz/quiz.scss +++ b/src/components/features/quiz/quiz.scss @@ -520,7 +520,6 @@ $maxWidthContainer: 1123; .block-completed-test { background: #ffffff; border-radius: 12px; - // .block-completed-test__container &__container { padding: 41px 35px 29px 59px; @@ -529,8 +528,6 @@ $maxWidthContainer: 1123; flex-wrap: wrap; } - // .block-completed-test__img - &__img { flex: 0 0 54px; height: 60px; @@ -542,8 +539,6 @@ $maxWidthContainer: 1123; } } - // .block-completed-test__title - &__title { font-weight: 700; font-size: 18px; diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 2fab3efd..67feda43 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -528,7 +528,9 @@ export const ProjectTracker = () => {
)} {projectBoard.projectUsers?.length > 3 && ( - +1 + + +{projectBoard.projectUsers?.length - 3} + )} {
+ -

Добавить участников

+

Добавить участника

diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index e94e40b8..6bae419d 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -124,8 +124,7 @@ &__content { width: 100%; background: #ffffff; - padding: 30px 0; - margin-bottom: 10px; + padding-top: 20px; &__wrapper { max-width: 1160px;