From db7a599a32a361e569055598d9cfd8078a898291 Mon Sep 17 00:00:00 2001 From: Victor Batischev Date: Thu, 8 Feb 2024 18:47:05 +0300 Subject: [PATCH] fix tracker styles --- .../Tracker/ModalTicket/modalTicket.scss | 26 +++++++++---------- src/components/features/quiz/AlertResult.jsx | 4 +-- src/components/features/quiz/QuizReport.jsx | 14 +--------- src/components/features/quiz/quiz.scss | 4 +-- src/pages/Tracker/tracker.scss | 11 +++----- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 92e56b86..e08457a5 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -52,7 +52,7 @@ position: relative; display: flex; flex-direction: column; - width: 600px; + width: 630px; margin: 26px 0 0 21px; .title-project { @@ -100,10 +100,11 @@ } &__task { - margin-top: -5px; + margin-top: -20px; padding: 18px; display: flex; flex-direction: column; + overflow-y: scroll; input { font-style: normal; @@ -144,12 +145,9 @@ } .taskName { - display: -webkit-box; max-width: 550px; - overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; - -webkit-box-orient: vertical; } .fullName { @@ -613,8 +611,8 @@ .exit { cursor: pointer; position: absolute; - top: 25px; - right: 20px; + top: 15px; + right: 15px; width: 13px; height: 13px; display: flex; @@ -661,7 +659,7 @@ color: #000000; font-size: 12px; line-height: 32px; - margin-left: 17px; + margin-left: 10px; font-style: normal; font-weight: 400; } @@ -964,11 +962,11 @@ } &_box { - padding: 25px 0px 10px 40px; + padding: 25px 0px 10px 20px; border-bottom: 1px solid #f1f1f1; &-middle { - padding: 0px 0px 10px 35px; + padding: 0px 0px 10px 20px; border-bottom: 1px solid #f1f1f1; } @@ -979,7 +977,7 @@ position: relative; row-gap: 10px; - padding: 10px 40px 0px 40px; + padding: 10px 40px 0px 20px; border-radius: 10px; margin-bottom: 10px; @@ -1110,7 +1108,7 @@ &-priority { position: relative; - padding: 10px 40px 0 40px; + padding: 10px 40px 0 20px; border-radius: 10px; margin-bottom: 10px; .priority { @@ -1170,7 +1168,7 @@ } &-bottom { - padding: 0px 110px 10px 35px; + padding: 0px 90px 10px 35px; font-weight: 400; font-size: 14px; line-height: 32px; @@ -1186,7 +1184,7 @@ } p { - margin: 0 0 0 12px; + margin: 0 0 0 5px; } } diff --git a/src/components/features/quiz/AlertResult.jsx b/src/components/features/quiz/AlertResult.jsx index 71eda511..bccacf5b 100644 --- a/src/components/features/quiz/AlertResult.jsx +++ b/src/components/features/quiz/AlertResult.jsx @@ -17,8 +17,8 @@ export const AlertResult = ({ info }) => { className="alert-result__text" style={{ color: successTest ? "#52B709" : "#5B6871" }} > - Благодарим Вас за прохождение теста "{info.questionnaire_title}". - Ваши результаты проверены, готовы пригласить Вас в команду + Благодарим Вас за прохождение теста "{info.questionnaire_title}". Ваши + результаты проверены, мы готовы пригласить Вас в команду {!successTest && ( diff --git a/src/components/features/quiz/QuizReport.jsx b/src/components/features/quiz/QuizReport.jsx index ec9b3423..ecf48415 100644 --- a/src/components/features/quiz/QuizReport.jsx +++ b/src/components/features/quiz/QuizReport.jsx @@ -3,12 +3,6 @@ import React from "react"; import StarRating from "@components/StarRating/StarRating"; export const QuizReport = ({ info }) => { - function correctAnswers() { - return info.number_questions * info.percent_correct_answers; - } - function correctWrongAnswers() { - return info.number_questions * (1 - info.percent_correct_answers); - } return (
@@ -23,16 +17,10 @@ export const QuizReport = ({ info }) => {
- {Boolean(correctAnswers()) ? correctAnswers() : 0} + {info.count_correct_answers}/{info.number_questions}
правильных ответов
-
-
- {Boolean(correctWrongAnswers()) ? correctWrongAnswers() : 0} -
-
неправильных ответов
-
Статус:
Пройден!
diff --git a/src/components/features/quiz/quiz.scss b/src/components/features/quiz/quiz.scss index 12e02b8d..d343d23e 100644 --- a/src/components/features/quiz/quiz.scss +++ b/src/components/features/quiz/quiz.scss @@ -580,7 +580,7 @@ $maxWidthContainer: 1123; &__column { &:first-child { background: #ffffff; - flex: 0 1 22%; + flex: 0 1 40%; border-radius: 12px 0 0 12px; @media (max-width: 1000px) { flex: 0 1 50%; @@ -590,7 +590,7 @@ $maxWidthContainer: 1123; } } height: 90px; - flex: 0 1 26%; + flex: 0 1 30%; display: flex; justify-content: center; align-items: center; diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index cafefd44..e94e40b8 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -354,7 +354,7 @@ border: 1px solid #e3e2e2; padding: 2px 6px; position: relative; - max-width: 220px; + max-width: 190px; width: 100%; @media (max-width: 915px) { @@ -830,9 +830,7 @@ max-height: 100px; overflow: hidden; text-overflow: ellipsis; - display: -webkit-box; -webkit-line-clamp: 3; - -webkit-box-orient: vertical; } span { @@ -868,6 +866,7 @@ column-gap: 10px; align-items: center; pointer-events: none; + margin-top: 5px; &__more { cursor: pointer; @@ -898,7 +897,7 @@ display: flex; align-items: center; column-gap: 5px; - margin-bottom: 8px; + margin-top: 3px; p { font-weight: 500; @@ -927,7 +926,6 @@ display: flex; align-items: center; column-gap: 5px; - margin-bottom: 8px; p { font-weight: 500; @@ -944,7 +942,6 @@ &__executor { display: flex; align-items: center; - margin-top: 2px; font-size: 14px; font-weight: 500; column-gap: 5px; @@ -967,7 +964,7 @@ flex-wrap: wrap; column-gap: 6px; row-gap: 3px; - margin: 5px 0 8px; + margin: 3px 0; .tagItem { padding: 3px 10px;