diff --git a/src/assets/images/archiveIcon.png b/src/assets/images/archiveIcon.png new file mode 100644 index 00000000..ad94e2b4 Binary files /dev/null and b/src/assets/images/archiveIcon.png differ diff --git a/src/components/AuthBox/authBox.scss b/src/components/AuthBox/authBox.scss index 739ca575..73c2f1d3 100644 --- a/src/components/AuthBox/authBox.scss +++ b/src/components/AuthBox/authBox.scss @@ -133,13 +133,14 @@ text-align: center; border: 2px solid #6aaf5c; margin-right: 1.5rem; + transition: 0.3s; &:hover { - background-image: none; - background-color: #ffffff; - border: 2px solid #6aaf5c; - color: #6aaf5c !important; - transition: 0.3s; + transform: scale(1.03); + //background-image: none; + //background-color: #ffffff; + //border: 2px solid #6aaf5c; + //color: #6aaf5c !important; .loader * { fill: #6aaf5c; diff --git a/src/components/Common/Loader/loader.scss b/src/components/Common/Loader/loader.scss index bfb8b104..980447e7 100644 --- a/src/components/Common/Loader/loader.scss +++ b/src/components/Common/Loader/loader.scss @@ -6,9 +6,9 @@ align-items: center; position: relative; - &:hover { - path { - fill: #6aaf5c; - } - } + //&:hover { + // path { + // fill: #6aaf5c; + // } + //} } diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index 0f9639c2..f64ff98f 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -15,11 +15,60 @@ position: relative; background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%); border-radius: 24px; - padding: 60px 60px 30px 60px; + padding: 20px 40px 30px 40px; display: flex; flex-direction: column; align-items: center; justify-content: center; + + .selectPerson { + align-items: start; + + &__info { + font-size: 15px; + font-weight: 300; + margin: 12px 0 20px; + } + } + + .invite__blocks { + display: flex; + column-gap: 20px; + + span { + margin-top: 8px; + font-size: 15px; + font-weight: 300; + } + + .invitePersonBlock { + display: flex; + flex-direction: column; + row-gap: 20px; + &__input { + margin: 0; + min-width: 320px; + height: 42px; + + input { + height: 42px; + } + } + + &__btn { + margin: 0 auto 0 0; + max-width: 242px; + width: 100%; + } + } + } + + .select__person { + display: flex; + flex-direction: column; + row-gap: 10px; + padding: 39px 10px 29px 10px; + } } } diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index 640f6d46..a711a0ab 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -363,9 +363,9 @@ export const ModalTiсket = ({
Создатель : {task.user?.fio}
{executor ? ( diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index a5f8c70b..8baa91cf 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -33,6 +33,9 @@ display: flex; align-items: center; flex-direction: row; + color: #1458DD; + font-weight: 700; + font-size: 22px; &__category { margin-right: 17px; @@ -104,9 +107,9 @@ h5 { font-family: "Inter", sans-serif; - font-weight: 500; + font-weight: 600; font-style: normal; - font-size: 16px; + font-size: 19px; line-height: 24px; color: #1a1919; margin-bottom: 0; @@ -280,7 +283,7 @@ &__description { display: flex; flex-direction: column; - margin-top: 10px; + margin-top: 12px; textarea { min-height: 120px; @@ -405,6 +408,7 @@ display: flex; flex-direction: column; font-size: 14px; + margin-top: 8px; &__list { display: flex; @@ -420,13 +424,17 @@ .exit { cursor: pointer; position: absolute; - top: 35px; - right: 40px; + top: 25px; + right: 30px; + width: 13px; + height: 13px; + display: flex; + align-items: center; + justify-content: center; &:before, &:after { content: ""; - position: absolute; width: 16px; height: 2px; background: #263238; @@ -459,6 +467,7 @@ align-items: center; position: relative; margin-bottom: 5px; + margin-top: 12px; span { color: #000000; @@ -552,6 +561,7 @@ overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + margin-bottom: 8px; span { margin-left: 5px; @@ -585,7 +595,6 @@ .task__info { display: flex; flex-direction: column; - row-gap: 5px; .delete { cursor: pointer; @@ -669,6 +678,10 @@ align-items: center; padding-left: 10px; + img { + width: 11px; + } + p { margin: 0 0 0 12px; } diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index b6acf4fb..a8451048 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -24,8 +24,7 @@ import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadc import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import TrackerTaskComment from "@components/TrackerTaskComment/TrackerTaskComment"; -import archive from "assets/icons/archive.svg"; -import archive2 from "assets/icons/archive.svg"; +import archive from "assets/images/archiveIcon.png"; import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrowStart from "assets/icons/arrows/arrowStart.png"; import close from "assets/icons/close.png"; @@ -412,7 +411,7 @@ export const TicketFullScreen = () => { <>ссылка на задачу
в архив
- {selectedWorker - ? selectedWorker.employee.fio - : "Выберите пользователя"} -
- - {Boolean(selectWorkersOpen) && ( -{worker.employee.fio}
- -Выберите пользователя в проекте или добавьте по e- mail
++ {selectedWorker + ? selectedWorker.employee.fio + : "Выберите пользователя"} +
+ + {Boolean(selectWorkersOpen) && ( +{worker.employee.fio}
+ +Выберите исполнитель
+Выберите исполнителя
4 && number % 100 < 20 + ? 2 + : cases[number % 10 < 5 ? number % 10 : 5] + ]; + } }