src/components/AuthBox/AuthBox.jsx

@@ -63,7 +63,7 @@ export const AuthBox = ({ title }) => {
           localStorage.setItem("role_status", res.status);
           localStorage.setItem(
             "access_token_expired_at",
-            res.access_token_expired_at,
+            res.access_token_expired_at
           );
           dispatch(auth(true));
           dispatch(setUserInfo(res));

src/components/Calendar/calendarComponent.scss

@@ -186,26 +186,16 @@
         }
       }
 
-      @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: 550px) {
+      @media (max-width: 610px) {
-        width: 60px;
+        width: 55px;
-        height: 35px;
+        height: 45px;
       }
 
-      @media (max-width: 450px) {
+      @media (max-width: 480px) {
         width: 45px;
         height: 35px;
       }

src/components/ProfileCalendar/ProfileCalendar.jsx

@@ -64,8 +64,8 @@ export const ProfileCalendar = () => {
     }
     apiRequest(
       `/reports/reports-by-date?${requestDates}&user_card_id=${localStorage.getItem(
-        "cardId",
+        "cardId"
-      )}`,
+      )}`
     ).then((reports) => {
       let spendTime = 0;
       for (const report of reports) {

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -205,11 +205,11 @@ export const ProfileCalendarComponent = React.memo(
       <div className="calendar-component">
         <div className="calendar-component__header">
           <div className="calendar-component__header-info">
-            <h3>Мои отчеты за </h3>
+            <h3>Мои отчеты:</h3>
             <p className="calendar__hours">
               {month}&nbsp;
               <span>
-                ({totalHours} {hourOfNum(totalHours)})
+                {totalHours} {hourOfNum(totalHours)}{" "}
               </span>
             </p>
           </div>
@@ -316,15 +316,13 @@ 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

src/components/ReportForm/ReportForm.jsx

@@ -180,7 +180,9 @@ const ReportForm = () => {
                 <p className="report-form__task-title--description">
                   Краткое описание задачи
                 </p>
-                <p className="report-form__task-title--hours">Кол-во часов</p>
+                <p className="report-form__task-title--hours">
+                  Количество часов
+                </p>
               </div>
 
               {inputs.map((input, index) => {
@@ -297,7 +299,7 @@ const ReportForm = () => {
                   {isFetching ? <Loader /> : "Отправить"}
                 </button>
                 <p className="report-form__footer-text">
-                  Всего за день:{" "}
+                  Всего за день :{" "}
                   <span>
                     {totalHours} {hourOfNum(totalHours)}
                   </span>

src/components/ReportForm/reportForm.scss

@@ -352,7 +352,6 @@
 
   &__footer {
     display: flex;
-    flex-direction: column-reverse;
     align-items: center;
     margin-top: 20px;
 
@@ -381,13 +380,16 @@
     &-text {
       font-family: "GT Eesti Pro Display";
       font-size: 1.9em;
+      font-weight: 600;
       font-style: normal;
       letter-spacing: normal;
       line-height: 22.38px;
-      margin-bottom: 20px;
+      text-align: left;
+      margin-left: 40px;
+      margin-bottom: 0;
 
       span {
-        font-weight: 600;
+        font-weight: 100;
       }
     }
 

src/components/features/quiz/Instructions.jsx

@@ -47,7 +47,7 @@ export const Instruction = () => {
                 <img src={comment} alt="" />
               </div>
               <div className="instruction__text instruction__text_info">
-                Вопросов в тесте: <span>{countQuestions}</span>
+                Количество вопросов в тесте: <span>{countQuestions}</span>
               </div>
             </div>
           </>