Commit cf6fe923 authored by Ermolaev Timur's avatar Ermolaev Timur

#111 Подправил стили

parent 8e13b66b
......@@ -10,8 +10,8 @@ function CalendarModalTaskContent({ title, onChangeCurrentTaskHandler, descripti
if (title) {
const startHourInt = parseInt(startHour)
const endHourInt = parseInt(endHour)
if (startHourInt >= 8 && startHourInt <= 22) {
if (endHourInt >= 8 && endHourInt <= 22) {
if (startHourInt >= 8 && startHourInt <= 24) {
if (endHourInt >= 8 && endHourInt <= 24) {
if (startHourInt < endHourInt) {
return true
}
......
......@@ -85,7 +85,7 @@ function CalendarColumnDayWeek({ hoursInDay, tasks, month, year, day, hourFormat
const arr = ['red', 'blue', 'yellow', 'purple', 'green']
return (<>
<Grid item xs={12 / 7} ref={dayColumnRef} sx={{ position: 'relative' }}>
<Grid item xs={12 / 7} ref={dayColumnRef} sx={{ position: 'relative'}}>
{linesInDay?.map((line, i) => {
const boxes = getBoxesInLine(line, hoursInDay, sortedTasks, linesInDay)
return (<>
......
......@@ -17,7 +17,7 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex }) {
const styles = {
borderRadius: '5px',
border: '1px solid black',
border: '1px solid white',
backgroundColor: color,
height: `${height}px`,
width: `${width}px`,
......@@ -27,14 +27,21 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex }) {
zIndex: zIndex,
textAlign: 'left',
overflow: 'hidden',
textOverflow: 'ellipsis'
textOverflow: 'ellipsis',
'&:hover': {
cursor: 'pointer',
boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
},
"&:active": {
zIndex: 100
}
}
return (
<Box
sx={styles}>
<span style={{position: 'absolute', textOverflow: 'ellipsis', padding: '5px 0 0 10px'}}>
{task.title}
<span style={{textOverflow: 'ellipsis', padding: '5px 0 0 5px'}}>
{task.title}
</span>
</Box>);
}
......
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