Merge branch 'master' into resources-staff-view

src/components/pages/StandardView/index.tsx

...ents/pages/Timeline/components/DayIndicatorGrid/index.tsx

...es/Timeline/components/DayIndicatorGrid/style.module.scss

src/components/pages/Timeline/components/EventGrid/index.tsx

...nts/pages/Timeline/components/EventGrid/style.module.scss

...components/pages/Timeline/components/EventModal/index.tsx

...ts/pages/Timeline/components/EventModal/style.module.scss

...ponents/pages/Timeline/components/ModuleHeading/index.tsx

...pages/Timeline/components/ModuleHeading/style.module.scss

...components/pages/Timeline/components/ModuleRows/index.tsx

...ts/pages/Timeline/components/ModuleRows/style.module.scss

...mponents/pages/Timeline/components/TermSwitcher/index.tsx

.../pages/Timeline/components/TermSwitcher/style.module.scss

...nts/pages/Timeline/components/TimelineEventCard/index.tsx

...s/Timeline/components/TimelineEventCard/style.module.scss

...onents/pages/Timeline/components/TimelineMobile/index.tsx

...ages/Timeline/components/TimelineMobile/style.module.scss

...omponents/pages/Timeline/components/WeekHeading/index.tsx

...s/pages/Timeline/components/WeekHeading/style.module.scss

src/components/pages/Timeline/components/WeekRow/index.tsx