Merge branch 'profileCalendar' into profilePage

# Conflicts:
#	src/App.js
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/components/ReportForm/ReportForm.js
#	src/pages/Profile.js
This commit is contained in:
Z1chi committed 2023-01-16 19:20:49 +03:00
commit 794a5fa44e
14 files changed
+316 -113

No files matched your search

@@ -57,6 +57,11 @@
font-size: 18px;
line-height: 32px;
color: #807777 !important;
transition: all 0.3s ease;
&:hover {
color: #261a1a !important;
}
}
@media (max-width: 800px) {