fix: CalendarCourseCell spacing

src/views/components/common/CalendarCourseCell/CalendarCourseCell.tsx

@@ -1,4 +1,6 @@
-import { Status } from '@shared/types/Course';
+import { Course, Status } from '@shared/types/Course';
+import { CourseMeeting } from '@shared/types/CourseMeeting';
+import clsx from 'clsx';
 import React from 'react';
 import { CourseColors, pickFontColor } from 'src/shared/util/colors';
 import ClosedIcon from '~icons/material-symbols/lock';
@@ -36,6 +38,7 @@ const CalendarCourseCell: React.FC<CalendarCourseCellProps> = ({ course, meeting
                 backgroundColor: colors.primaryColor,
             }}
         >
+<<<<<<< HEAD
             <div className='flex flex-1 flex-col gap-1'>
                 <Text variant='h1-course' className='leading-[75%]!'>
                     {courseDeptAndInstr}
@@ -43,6 +46,22 @@ const CalendarCourseCell: React.FC<CalendarCourseCellProps> = ({ course, meeting
                 {timeAndLocation && (
                     <Text variant='h3-course' className='leading-[75%]!'>
                         {timeAndLocation}
+=======
+            <div className='flex flex-1 flex-col gap-1 overflow-x-hidden'>
+                <Text
+                    variant='h1-course'
+                    className={clsx('-my-0.8 leading-tight', {
+                        truncate: meeting,
+                    })}
+                >
+                    {course.department} {course.number} - {course.instructors[0].lastName}
+                </Text>
+                {meeting && (
+                    <Text variant='h3-course' className='-mb-0.5'>
+                        {`${meeting.getTimeString({ separator: '–', capitalize: true })}${
+                            meeting.location ? ` – ${meeting.location.building}` : ''
+                        }`}
+>>>>>>> 73fe14e (fix calendar course cell spacing)
                     </Text>
                 )}
             </div>