adaptive-candidate #6

Merged
nikita.gubar merged 2 commits from adaptive-candidate into main 2023-12-21 18:08:02 +03:00
2 changed files with 42 additions and 6 deletions

View File

@ -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
? "Выберите диапазон на календаре"
: "Выбрать диапазон"}
? "Выберите диапазон на календаре"
: "Выбрать диапазон"}
</span>
<span>
{totalRangeHours
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
: endDate
? "0 часов"
: ""}
? "0 часов"
: ""}
</span>
{endDate && (
<BaseButton

View File

@ -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;