Merge branch 'develop' of https://github.com/OpenSourceBrain/OSBv2 in…

…to develop
OpenSourceBrain · Mar 26, 2024 · 74c656d · 74c656d
2 parents ca6cfad + 9bb1f51
commit 74c656d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/applications/osb-portal/src/App.tsx b/applications/osb-portal/src/App.tsx
@@ -44,9 +44,7 @@ const styles = {
     minHeight: "100vh",
     display: "flex",
     flexDirection: "column",
-    height: {
-      md: "100vh",
-    },
+    height: "100vh",
     overflow: {
       xs: "auto",
       md: "hidden",

diff --git a/applications/osb-portal/src/components/workspace/drawer/WorkspaceDrawer.tsx b/applications/osb-portal/src/components/workspace/drawer/WorkspaceDrawer.tsx
@@ -158,6 +158,7 @@ export const WorkspaceDrawer: React.FunctionComponent<WorkspaceDrawerProps> = ({
         alignItems="stretch"
         flex="1"
         className="verticalFill"
+        height={1}
       >
         <Drawer
           variant="permanent"

diff --git a/applications/osb-portal/src/pages/WorkspaceOpenPage.tsx b/applications/osb-portal/src/pages/WorkspaceOpenPage.tsx
@@ -19,7 +19,7 @@ export default (props: any) => {
   }, [workspaceId]);
 
   return (
-    <Box className="verticalFill">
+    <Box className="verticalFill" height={1}>
       <Divider variant="fullWidth" />
       <WorkspaceDrawer app={app} />
     </Box>

diff --git a/applications/osb-portal/src/pages/WorkspacePage.tsx b/applications/osb-portal/src/pages/WorkspacePage.tsx
@@ -97,16 +97,13 @@ export const WorkspacePage = (props: any) => {
             <Grid
               container={true}
               alignItems="center"
+              justifyContent="space-between"
               className="verticalFill"
               spacing={1}
               sx={{ background: bgDarkest }}
             >
               <Grid
                 item={true}
-                xs={12}
-                sm={12}
-                md={7}
-                lg={7}
                 className="verticalFill"
               >
                 <NavbarButton
@@ -121,10 +118,6 @@ export const WorkspacePage = (props: any) => {
               <Grid
                 item={true}
                 gap={1}
-                xs={12}
-                sm={8}
-                md={5}
-                lg={5}
                 justifyContent="end"
                 padding={"0 16px"}
               >