From e04edda3a53748b7898d564eac67e73449b94085 Mon Sep 17 00:00:00 2001
From: mheggelund <maohe@equinor.com>
Date: Fri, 13 Oct 2023 10:56:56 +0200
Subject: [PATCH] chore: fix styling from merge

---
 src/App.styled.tsx                          |  1 -
 src/features/ModelView/ModelView.styled.tsx |  3 +--
 src/pages/Layout.tsx                        | 12 ++++++------
 src/pages/ModelPages/Model/Model.styled.tsx |  1 +
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/App.styled.tsx b/src/App.styled.tsx
index 1be2fe45..ff486a84 100644
--- a/src/App.styled.tsx
+++ b/src/App.styled.tsx
@@ -2,6 +2,5 @@ import styled from 'styled-components';
 
 const StyledOutletWrapper = styled.section`
   height: calc(100% - 128px);
-  overflow: scroll;
 `;
 export { StyledOutletWrapper as OutletWrapper };
diff --git a/src/features/ModelView/ModelView.styled.tsx b/src/features/ModelView/ModelView.styled.tsx
index 3359da93..0c336379 100644
--- a/src/features/ModelView/ModelView.styled.tsx
+++ b/src/features/ModelView/ModelView.styled.tsx
@@ -5,12 +5,11 @@ export const MetadataWrapper = styled.div`
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  height: 100%;
+  height: calc(100% - 75.5px);
   width: 100%;
   padding: ${spacings.X_LARGE};
   row-gap: ${spacings.XXX_LARGE};
   column-gap: ${spacings.X_LARGE};
-  overflow-y: scroll;
 
   @media (max-width: 1350px) {
     flex-direction: column;
diff --git a/src/pages/Layout.tsx b/src/pages/Layout.tsx
index 99ea0d1f..3a3f63cc 100644
--- a/src/pages/Layout.tsx
+++ b/src/pages/Layout.tsx
@@ -1,11 +1,11 @@
+import { useMsal } from '@azure/msal-react';
+import { useEffect } from 'react';
 import { Outlet } from 'react-router-dom';
+import * as Styled from '../App.styled';
+import { OpenAPI } from '../api/generated/core/OpenAPI';
 import AppBar from '../features/AppBar/AppBar';
 import { Footer } from '../features/Footer/Footer';
-import * as Styled from '../App.styled';
-import { useEffect } from 'react';
-import { useMsal } from '@azure/msal-react';
 import { useAccessToken } from '../hooks/useAccessToken';
-import { OpenAPI } from '../api/generated/core/OpenAPI';
 
 export const Layout = () => {
   const { instance, accounts } = useMsal();
@@ -16,12 +16,12 @@ export const Layout = () => {
   }, [token, accounts]);
 
   return (
-    <div>
+    <>
       <AppBar title="PEPM" />
       <Styled.OutletWrapper>
         <Outlet />
       </Styled.OutletWrapper>
       <Footer text="All information is proprietary of Equinor © 2023 Equinor ASA" />
-    </div>
+    </>
   );
 };
diff --git a/src/pages/ModelPages/Model/Model.styled.tsx b/src/pages/ModelPages/Model/Model.styled.tsx
index 6097bce7..c2ec1147 100644
--- a/src/pages/ModelPages/Model/Model.styled.tsx
+++ b/src/pages/ModelPages/Model/Model.styled.tsx
@@ -12,6 +12,7 @@ export const Wrapper = styled.div`
 
 export const ContentWrapper = styled.div`
   width: 100%;
+  overflow: scroll;
 `;
 
 export const SidebarWrapper = styled.div`