diff --git a/src/components/Calendar/calendarComponent.scss b/src/components/Calendar/calendarComponent.scss
index ba69a3c7..2a774ea9 100644
--- a/src/components/Calendar/calendarComponent.scss
+++ b/src/components/Calendar/calendarComponent.scss
@@ -11,6 +11,21 @@
&__header {
display: flex;
+ justify-content: space-between;
+
+ &-info {
+ display: flex;
+
+ .calendar__hours {
+ margin: 0 10px;
+ line-height: 0;
+ font-weight: 500;
+ }
+ }
+
+ &-switcher {
+ display: flex;
+ }
h3 {
@@ -20,6 +35,7 @@
letter-spacing: normal;
line-height: 30px;
text-align: left;
+ margin-bottom: 0;
@media (max-width: 500px) {
font-size: 1.7em;
diff --git a/src/components/Calendar/calendarHelper.js b/src/components/Calendar/calendarHelper.js
index 30d8c7c7..73afcb39 100644
--- a/src/components/Calendar/calendarHelper.js
+++ b/src/components/Calendar/calendarHelper.js
@@ -60,3 +60,9 @@ export function getCorrectDate(day) {
export function currentMonthAndDayReportPage() {
return moment().format('D MMMM');
}
+
+export function hourOfNum(number) {
+ const hours = [' час', ' часа', ' часов'];
+ const cases = [2, 0, 1, 1, 1, 2];
+ return hours[(number % 100 > 4 && number % 100 < 20) ? 2 : cases[(number % 10 < 5) ? number % 10 : 5]];
+}
diff --git a/src/components/ProfileCalendar/ProfileCalendar.js b/src/components/ProfileCalendar/ProfileCalendar.js
index a81a2325..7bf845af 100644
--- a/src/components/ProfileCalendar/ProfileCalendar.js
+++ b/src/components/ProfileCalendar/ProfileCalendar.js
@@ -80,9 +80,11 @@ export const ProfileCalendar = () => {
{loader ?
-
+ {month} - {totalHours} {hourOfNum(totalHours)} +
- {month} : {totalHours} часов -
- Всего за день : {totalHours} часов + Всего за день : {totalHours} {hourOfNum(totalHours)}
{reportSuccess &&{reportSuccess}
diff --git a/src/components/ReportForm/reportForm.scss b/src/components/ReportForm/reportForm.scss index 635d4acf..226bb528 100644 --- a/src/components/ReportForm/reportForm.scss +++ b/src/components/ReportForm/reportForm.scss @@ -151,8 +151,7 @@ p { font-family: 'GT Eesti Pro Display'; - font-size: 1.3em; - font-weight: 100; + font-size: 1.5em; font-style: normal; letter-spacing: normal; line-height: normal; @@ -168,10 +167,10 @@ //} &--hours { - margin-left: 330px; + margin-left: 310px; @media (max-width: 810px) { - margin-left: 125px; + margin-left: 100px; } @media (max-width: 610px) { @@ -202,6 +201,11 @@ margin-left: 20px; &--description { + + .checkTask { + border-color: #fc0000; + } + input { width: 460px; height: 42px; @@ -225,6 +229,14 @@ } &--hours { + @media (max-width: 610px) { + margin-left: 45px; + } + + .checkTask { + border-color: #fc0000; + } + input { width: 141px; height: 42px; @@ -257,8 +269,7 @@ span { font-family: 'GT Eesti Pro Display'; - font-size: 1.3em; - font-weight: 100; + font-size: 1.5em; font-style: normal; letter-spacing: normal; line-height: normal; diff --git a/src/pages/Summary/Summary.js b/src/pages/Summary/Summary.js index c496e028..63abf220 100644 --- a/src/pages/Summary/Summary.js +++ b/src/pages/Summary/Summary.js @@ -60,7 +60,7 @@ export const Summary = () => {