Skip to content

Commit 70c7ca7

Browse files
committed
#3133 fixed timeslot alignment in edit availability modal and changed text type to React.ReactNode in timeslot interface
1 parent 38de683 commit 70c7ca7

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/frontend/src/components/TimeSlot.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Box } from '@mui/system';
22
import { Icon } from '@mui/material';
33

44
interface TimeSlotProps {
5-
text?: string;
5+
text?: React.ReactNode;
66
fontSize?: string;
77
backgroundColor?: string;
88
icon?: string;

src/frontend/src/pages/SettingsPage/UserScheduleSettings/Availability/EditAvailability.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,33 +129,33 @@ const EditAvailability: React.FC<EditAvailabilityProps> = ({
129129
Invert Availability
130130
</NERButton>
131131
</Grid>
132-
<TimeSlot backgroundColor={HeatmapColors[0]} widthOverride="102px" heightOverride="45px" />
132+
<TimeSlot backgroundColor={HeatmapColors[0]} widthOverride="106px" heightOverride="px" />
133133
{currentlyDisplayedAvailabilities.map((availability) => (
134134
<TimeSlot
135135
key={availability.dateSet.getTime()}
136136
backgroundColor={HeatmapColors[0]}
137-
widthOverride="102px"
138-
heightOverride="45px"
139-
text={getDayOfWeek(availability.dateSet) + ' ' + datePipe(availability.dateSet)}
137+
widthOverride="106px"
138+
heightOverride="px"
139+
text={<>{getDayOfWeek(availability.dateSet)} <br /> {datePipe(availability.dateSet)}</>}
140140
fontSize={'12px'}
141141
/>
142142
))}
143143
{enumToArray(REVIEW_TIMES).map((time, timeIndex) => (
144144
<Grid container item>
145145
<TimeSlot
146146
backgroundColor={HeatmapColors[0]}
147-
widthOverride="102px"
147+
widthOverride="106px"
148148
heightOverride="32px"
149149
text={time}
150-
fontSize={'13px'}
150+
fontSize={'px'}
151151
/>
152152
{currentlyDisplayedAvailabilities.map((availability, dayIndex) => {
153153
const backgroundColor = availability.availability.includes(timeIndex) ? HeatmapColors[3] : HeatmapColors[0];
154154
return (
155155
<TimeSlot
156156
key={timeIndex * enumToArray(REVIEW_TIMES).length + dayIndex}
157157
backgroundColor={backgroundColor}
158-
widthOverride="102px"
158+
widthOverride="106px"
159159
heightOverride="32px"
160160
onMouseDown={(e) => handleMouseDown(e, availability, timeIndex)}
161161
onMouseEnter={(e) => handleMouseEnter(e, availability, timeIndex)}

0 commit comments

Comments
 (0)