Commit 31849cfa authored by Ermolaev Timur's avatar Ermolaev Timur

#133 пофиксил баг, сделал анимации чуть плавнее

parent bfb45f27
......@@ -16,6 +16,7 @@
"@testing-library/user-event": "^13.5.0",
"axios": "^1.1.2",
"dayjs": "^1.11.6",
"react-datepicker": "^4.8.0",
"moment": "^2.29.4",
"prop-types": "^15.8.1",
"react": "^18.2.0",
......
......@@ -27,9 +27,11 @@ const CalendarTask = ({ setCurrentTask, handleOpen, task, setCopyTask, width, le
borderRadius: '10px',
alignItems: 'center',
zIndex: '5',
transition: '0.3s',
'&:hover': {
transition: '0.3s',
cursor: 'pointer',
boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.4)'
},
}
}, [width, left, top, color])
......
......@@ -11,7 +11,9 @@ const CalendarStandartCell = ({ children, xs, hours, dayNumber, createTaskInCell
height: linesInDay?.length ? `${heightCell * linesInDay.length + 5}px` : `${45}px`,
borderRight: '1px solid black',
borderBottom: week ? '1px solid black' : null,
transition: '0.3s',
'&:hover': {
transition: '0.3s',
cursor: children ? null : '#d6d2d2',
background: children ? null : '#d6d2d2'
},
......
......@@ -46,8 +46,10 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen,
zIndex: zIndexStyle,
textAlign: 'left',
overflow: 'hidden',
transition: '0.2s',
textOverflow: 'ellipsis',
'&:hover': {
transition: '0.2s',
cursor: 'pointer',
boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
},
......
......@@ -260,7 +260,6 @@ function WeekCalendar() {
setUserCalendarId(null)
}
}, [dispatch, user.id, userId])
return (
<>
<DefaultModal
......@@ -270,7 +269,7 @@ function WeekCalendar() {
<CalendarModalWorkerContent
workerInfo={workerInfo}
allUserProjects={allUserProjects}
workers={project?.project?.members}
workers={workerInfo?.project?.members}
onChangeProjectHandler={onChangeProjectHandler}
onChangeWorkerHandler={onChangeWorkerHandler}
handleClose={handleClose}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment