From 2d0a824aa4942a8908925afe32afdf47eca4b4b6 Mon Sep 17 00:00:00 2001 From: Gubar Nikita Date: Thu, 21 Dec 2023 17:25:53 +0300 Subject: [PATCH 1/2] add adaptive-candidate --- .../registationForCandidate.scss | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/pages/RegistrationForCandidate/registationForCandidate.scss b/src/pages/RegistrationForCandidate/registationForCandidate.scss index 72cd7d45..f714d54f 100644 --- a/src/pages/RegistrationForCandidate/registationForCandidate.scss +++ b/src/pages/RegistrationForCandidate/registationForCandidate.scss @@ -10,12 +10,32 @@ align-items: center; margin-top: 55px; + @media (max-width: 1375px) { + padding-top: 75px; + } + @media (max-width: 1024px) { padding-top: 70px; } .step { top: 36.5%; + + @media (max-width: 1375px) { + top: 42%; + } + + @media (max-width: 1072px) { + top: 32%; + } + + @media (max-width: 1024px) { + top: 28%; + } + + @media (max-width: 660px) { + top: 23%; + } } } @@ -27,6 +47,14 @@ background: #ffffff; border-radius: 12px; width: 100%; + + @media (max-width: 660px) { + flex-direction: column; + } + + @media (max-width: 402px) { + align-items: center; + } } &__info { @@ -87,6 +115,14 @@ flex-direction: column; width: 46%; + @media (max-width: 1072px) { + width: 75%; + } + + @media (max-width: 478px) { + width: 100%; + } + label { font-weight: 400; font-size: 15px; -- 2.34.1 From 2996b78e6e49da4e1610ac561cbb3b4375877f9e Mon Sep 17 00:00:00 2001 From: Gubar Nikita Date: Thu, 21 Dec 2023 17:31:52 +0300 Subject: [PATCH 2/2] ProfileCalendar --- .../ProfileCalendar/ProfileCalendarComponent.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 7de276b0..33c4f85f 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -17,11 +17,11 @@ import { apiRequest } from "@api/request"; import "@components/Calendar/calendarComponent.scss"; import { calendarHelper, + correctDay, currentMonthAndDay, getCorrectDate, getReports, - hourOfNum, - correctDay + hourOfNum } from "@components/Calendar/calendarHelper"; import BaseButton from "@components/Common/BaseButton/BaseButton"; import ShortReport from "@components/ShortReport/ShortReport"; @@ -295,15 +295,15 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите диапазон на календаре" - : "Выбрать диапазон"} + ? "Выберите диапазон на календаре" + : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && (