Merge pull request #83 from autentia/feature/#183814286-full-page-cal…

…endar Feature/#183814286 full page calendar
tntconcept · Jan 19, 2023 · a37a421 · a37a421
2 parents ec48aa8 + cd64885
commit a37a421
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/modules/binnacle/page/BinnacleDesktop/ActivitiesCalendar/ActivitiesCalendar.tsx b/src/modules/binnacle/page/BinnacleDesktop/ActivitiesCalendar/ActivitiesCalendar.tsx
@@ -107,11 +107,9 @@ const CalendarContainer = forwardRef<HTMLDivElement, any>((props, ref) => {
       ref={ref}
       h="100%"
       mx="32px"
-      mb="32px"
       role="application"
       templateColumns="repeat(6, minmax(178px, 1fr))"
-      templateRows="50px"
-      height="100vh"
+      templateRows="40px"
       autoRows="1fr"
       boxShadow="0 3px 15px 0 rgba(0, 0, 0, 0.15)"
       border="solid 1px"

diff --git a/src/modules/binnacle/page/BinnacleDesktop/BinnacleDesktop.tsx b/src/modules/binnacle/page/BinnacleDesktop/BinnacleDesktop.tsx
@@ -16,7 +16,7 @@ const BinnacleDesktop = () => {
   return (
     <Fragment>
       <SkipNavLink contentId="calendar-content" />
-      <Box as="main" overflowY="hidden">
+      <Box as="main" height="calc(100% - 65px - 32px)" display="flex" flexDirection="column">
         <Flex
           as="section"
           align="center"
@@ -30,7 +30,7 @@ const BinnacleDesktop = () => {
         {isLoading ? (
           <CalendarSkeleton />
         ) : (
-          <SkipNavContent id="calendar-content">
+          <SkipNavContent id="calendar-content" style={{ flexGrow: '1' }}>
             <ActivitiesCalendar />
           </SkipNavContent>
         )}

diff --git a/src/shared/components/Navbar/DesktopNavbar.tsx b/src/shared/components/Navbar/DesktopNavbar.tsx
@@ -24,7 +24,7 @@ export function DesktopNavbar() {
         justify="space-between"
         align="center"
         px="8"
-        mb="8"
+        mb="4"
         borderBottom="1px"
         borderColor={borderColor}
       >