diff --git a/src/components/Modal/Tracker/ListEmployees/listEmployees.scss b/src/components/Modal/Tracker/ListEmployees/listEmployees.scss index 30a087e6..065769aa 100644 --- a/src/components/Modal/Tracker/ListEmployees/listEmployees.scss +++ b/src/components/Modal/Tracker/ListEmployees/listEmployees.scss @@ -73,7 +73,7 @@ .add-person { background: #00c5a8; color: white; - font-size: 14px; + font-size: 18px; transition: all 0.15s ease; left: -28px; z-index: 2; diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 5c2a224c..31d1c65e 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -66,6 +66,7 @@ margin-left: 15px; &__category { + height: 22px; margin-right: 5px; } diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 516263fb..a60284dc 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -44,6 +44,7 @@ import TrackerSelectColumn from "@components/TrackerSelectColumn/TrackerSelectCo import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrowDown from "assets/icons/arrows/selectArrow.png"; import calendarIcon from "assets/icons/calendar.svg"; +import category from "assets/icons/category.svg"; import close from "assets/icons/close.png"; import commentsBoard from "assets/icons/commentsBoard.svg"; import del from "assets/icons/delete.svg"; @@ -483,8 +484,10 @@ export const ProjectTracker = () => {
-
{projectBoard.name}
- +
+ +
{projectBoard.name}
+
{ @@ -541,7 +544,6 @@ export const ProjectTracker = () => { > + -

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

{ }} >

Список тегов

- + + arrow
{tags.open && (
@@ -755,6 +761,19 @@ export const ProjectTracker = () => { > {tags.add ? "Добавить" : "Изменить"} + {tags.add && ( + + )}
)}
diff --git a/src/pages/Quiz/QuizPage.js b/src/pages/Quiz/QuizPage.js index 3778f4f8..ddf102c8 100644 --- a/src/pages/Quiz/QuizPage.js +++ b/src/pages/Quiz/QuizPage.js @@ -27,7 +27,7 @@ import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; import "./quiz-page.scss"; export const QuizPage = () => { - const [questionnaires, setQuestionnaires] = useState([]); + const [questionnaires, setQuestionnaires] = useState(null); const dispatch = useDispatch(); const [personalInfoItems] = useState([ { @@ -129,7 +129,8 @@ export const QuizPage = () => { {/*
*/}
Доступные тесты
- {questionnaires.length ? ( + {questionnaires && + questionnaires.length > 0 && questionnaires.map((item, index) => ( { passedTest={item.passedTest} key={index} /> - )) - ) : ( -

Анкет нет

+ ))} + {questionnaires && questionnaires.length === 0 && ( +

Нет доступных тестов

)}
{/*
*/} diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index f562aa2a..4c408792 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -219,6 +219,16 @@ border-bottom: 1px solid #dde2e4; padding: 0 35px 15px; + &__title { + display: flex; + align-items: center; + column-gap: 5px; + img { + margin-left: -22px; + height: 22px; + } + } + @media (max-width: 1000px) { padding: 0 15px 15px; } @@ -250,7 +260,7 @@ font-size: 22px; line-height: 32px; margin-bottom: 0; - max-width: 21%; + max-width: 160px; word-break: break-all; overflow: hidden; white-space: nowrap; @@ -456,8 +466,8 @@ } img { - width: 15px; - height: 15px; + width: 20px; + height: 20px; } &:hover { @@ -502,6 +512,13 @@ &__tags { position: relative; + img { + transition: all 0.15s ease; + margin-left: 5px; + } + .open { + transform: rotate(180deg); + } .tags { &__add { display: flex; @@ -571,8 +588,8 @@ justify-content: space-between; padding: 0px 8px; border-radius: 8px; - height: 50px; - max-height: 50px; + height: 40px; + max-height: 40px; background: #fff; &__description { @@ -676,7 +693,7 @@ border: none; background: #252c32; color: whitesmoke; - margin: 10px auto 0; + margin: 0 auto 0; border-radius: 10px; font-size: 15px; padding: 5px 12px;