icssc · MinhxNguyen7 · Oct 31, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024
diff --git a/apps/antalmanac/index.html b/apps/antalmanac/index.html
@@ -49,17 +49,7 @@
         <link rel="manifest" href="/manifest.json" />
         <link rel="shortcut icon" href="/favicon.ico" />
         <link rel="stylesheet" href="/google_font_roboto_300_400_500_700.css" />
-        <link
-            rel="stylesheet"
-            href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
-            integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
-            crossorigin=""
-        />
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
-        <link
-            rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/leaflet.locatecontrol/dist/L.Control.Locate.min.css"
-        />
 
         <!--
       Notice the use of %PUBLIC_URL% in the tags above.
@@ -110,7 +100,7 @@
     </head>
     <body style="overflow: hidden">
         <noscript> You need to enable JavaScript to run this app. </noscript>
-        <div id="root" style="height: 100vh; position: fixed; top: 0; width: 100%"></div>
+        <div id="root"></div>
         <script type="module" src="/src/index.tsx"></script>
     </body>
 </html>
diff --git a/apps/antalmanac/src/App.css b/apps/antalmanac/src/App.css
@@ -10,18 +10,3 @@
     font-size: 30pt;
     color: white;
 }
-
-/**
- * Needed to set the table cells to the correct height...for some reason?
- */
-@media (min-resolution: 120dpi) {
-    html {
-        font-size: 14px;
-    }
-}
-
-@media (min-resolution: 144dpi) {
-    html {
-        font-size: 12px;
-    }
-}
diff --git a/apps/antalmanac/src/components/Calendar/CalendarRoot.tsx b/apps/antalmanac/src/components/Calendar/CalendarRoot.tsx
@@ -65,12 +65,10 @@ const AntAlmanacEvent = ({ event }: { event: CalendarEvent }) => {
 };
 
 interface ScheduleCalendarProps {
-    isMobile: boolean;
+    isMobile?: boolean;
 }
 
-export default function ScheduleCalendar(props: ScheduleCalendarProps) {
-    const { isMobile } = props;
-
+export default function ScheduleCalendar(_props?: ScheduleCalendarProps) {
     const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
     const [showFinalsSchedule, setShowFinalsSchedule] = useState(false);
     const [courseInMoreInfo, setCourseInMoreInfo] = useState<CalendarEvent | null>(null);
@@ -163,8 +161,6 @@ export default function ScheduleCalendar(props: ScheduleCalendarProps) {
     const events = getEventsForCalendar();
     const hasWeekendCourse = events.some((event) => event.start.getDay() === 0 || event.start.getDay() === 6);
 
-    const calendarStyling = isMobile ? { height: `calc(100% - 55px)` } : { height: `calc(100vh - 104px)` };
-
     const calendarTimeFormat = isMilitaryTime ? 'HH:mm' : 'h:mm A';
     const calendarGutterTimeFormat = isMilitaryTime ? 'HH:mm' : 'h A';
 
@@ -213,21 +209,14 @@ export default function ScheduleCalendar(props: ScheduleCalendarProps) {
     }, []);
 
     return (
-        <Box
-            style={{
-                height: isMobile ? 'calc(100% - 50px)' : undefined,
-                margin: '0px 4px',
-                borderRadius: '1px',
-            }}
-            id={'calendar-root'}
-        >
+        <Box id="calendar-root" borderRadius={1} flexGrow={1} height={0} display="flex" flexDirection="column">
             <CalendarToolbar
                 currentScheduleIndex={currentScheduleIndex}
                 toggleDisplayFinalsSchedule={toggleDisplayFinalsSchedule}
                 showFinalsSchedule={showFinalsSchedule}
                 scheduleNames={scheduleNames}
             />
-            <Box id="screenshot" style={calendarStyling}>
+            <Box id="screenshot" height="0" flexGrow={1}>
                 <Popper
                     anchorEl={anchorEl}
                     placement="right"

diff --git a/apps/antalmanac/src/components/Map/Map.tsx b/apps/antalmanac/src/components/Map/Map.tsx
@@ -1,3 +1,5 @@
+import 'leaflet/dist/leaflet.css';
+import 'leaflet.locatecontrol/dist/L.Control.Locate.min.css';
 import './Map.css';
 
 import { Box, Paper, Tab, Tabs, Typography } from '@mui/material';

diff --git a/apps/antalmanac/src/components/RightPane/CoursePane/CoursePaneRoot.tsx b/apps/antalmanac/src/components/RightPane/CoursePane/CoursePaneRoot.tsx
@@ -54,7 +54,7 @@ function RightPane() {
     }, [handleKeydown]);
 
     return (
-        <Box height={'100%'} marginX={0.5}>
+        <Box height={0} flexGrow={1} marginX={0.5}>
             <CoursePaneButtonRow
                 showSearch={!searchIsDisplayed}
                 onDismissSearchResults={displaySearch}