diff --git a/src/components/Calendar/calendarComponent.scss b/src/components/Calendar/calendarComponent.scss index e251c75c..76d4ff00 100644 --- a/src/components/Calendar/calendarComponent.scss +++ b/src/components/Calendar/calendarComponent.scss @@ -186,16 +186,26 @@ } } + @media (max-width: 1200px) { + width: 110px; + } + @media (max-width: 968px) { + width: 90px; + font-size: 11px; + } + + @media (max-width: 680px) { + width: 70px; font-size: 10px; } - @media (max-width: 610px) { - width: 55px; - height: 45px; + @media (max-width: 550px) { + width: 60px; + height: 35px; } - @media (max-width: 480px) { + @media (max-width: 450px) { width: 45px; height: 35px; } diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 8c3ecbc1..2f3da598 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -205,11 +205,11 @@ export const ProfileCalendarComponent = React.memo(
-

Мои отчеты:

+

Мои отчеты за

{month}  - {totalHours} {hourOfNum(totalHours)}{" "} + ({totalHours} {hourOfNum(totalHours)})

@@ -316,13 +316,13 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите начало диапазона" + ? "Выберите диапазон на календаре" : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` - : "0 часов"} + : endDate ? "0 часов" : ""} {endDate && ( { const [isFetching, setIsFetching] = useState(false); const [reportSuccess, setReportSuccess] = useState(""); const [startDate, setStartDate] = useState( - reportDate ? new Date(reportDate._d) : new Date(), + reportDate ? new Date(reportDate._d) : new Date() ); const [datePickerOpen, setDatePickerOpen] = useState(false); @@ -73,7 +73,7 @@ const ReportForm = () => { (div) => div.classList && (div.classList.contains("report-form__block-img") || - div.classList.contains("react-datepicker-popper")), + div.classList.contains("react-datepicker-popper")) ) ) { setDatePickerOpen(false); @@ -180,9 +180,7 @@ const ReportForm = () => {

Краткое описание задачи

-

- Количество часов -

+

Кол-во часов

{inputs.map((input, index) => { @@ -212,7 +210,7 @@ const ReportForm = () => { task: e.target.value, } : input; - }), + }) ) } /> @@ -238,7 +236,7 @@ const ReportForm = () => { hours_spent: Number(e.target.value), } : input; - }), + }) ) } /> @@ -299,7 +297,7 @@ const ReportForm = () => { {isFetching ? : "Отправить"}

- Всего за день :{" "} + Всего за день:{" "} {totalHours} {hourOfNum(totalHours)} diff --git a/src/components/ReportForm/reportForm.scss b/src/components/ReportForm/reportForm.scss index f27547d0..1c78390a 100644 --- a/src/components/ReportForm/reportForm.scss +++ b/src/components/ReportForm/reportForm.scss @@ -352,6 +352,7 @@ &__footer { display: flex; + flex-direction: column-reverse; align-items: center; margin-top: 20px; @@ -380,16 +381,13 @@ &-text { font-family: "GT Eesti Pro Display"; font-size: 1.9em; - font-weight: 600; font-style: normal; letter-spacing: normal; line-height: 22.38px; - text-align: left; - margin-left: 40px; - margin-bottom: 0; + margin-bottom: 20px; span { - font-weight: 100; + font-weight: 600; } } diff --git a/src/components/features/quiz/Instructions.jsx b/src/components/features/quiz/Instructions.jsx index 46f05379..f06073a5 100644 --- a/src/components/features/quiz/Instructions.jsx +++ b/src/components/features/quiz/Instructions.jsx @@ -47,7 +47,7 @@ export const Instruction = () => {

- Количество вопросов в тесте: {countQuestions} + Вопросов в тесте: {countQuestions}