Skip to content

Commit

Permalink
chore: fix styling from merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mheggelund committed Oct 13, 2023
1 parent f57a51a commit c6fade6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/App.styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ import styled from 'styled-components';

const StyledOutletWrapper = styled.section`
height: calc(100% - 128px);
overflow: scroll;
`;
export { StyledOutletWrapper as OutletWrapper };
3 changes: 1 addition & 2 deletions src/features/ModelView/ModelView.styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/pages/Layout.tsx
Original file line number Diff line number Diff line change
@@ -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();
Expand All @@ -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>
</>
);
};
1 change: 1 addition & 0 deletions src/pages/ModelPages/Model/Model.styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const Wrapper = styled.div`

export const ContentWrapper = styled.div`
width: 100%;
overflow: scroll;
`;

export const SidebarWrapper = styled.div`
Expand Down

0 comments on commit c6fade6

Please sign in to comment.