diff --git a/src/components/ImageView/ImageView.styled.tsx b/src/components/ImageView/ImageView.styled.tsx index 74d22980..4a046d93 100644 --- a/src/components/ImageView/ImageView.styled.tsx +++ b/src/components/ImageView/ImageView.styled.tsx @@ -10,9 +10,9 @@ export const ImageWrapper = styled.div` border-style: solid; border-width: 1px; border-color: ${theme.light.ui.background.medium}; + width: 100%; - max-width: 100%; - + max-width: fit-content; height: fit-content; > h5 { diff --git a/src/components/ImageView/ImageView.tsx b/src/components/ImageView/ImageView.tsx index 5d525baf..f40b0db4 100644 --- a/src/components/ImageView/ImageView.tsx +++ b/src/components/ImageView/ImageView.tsx @@ -1,3 +1,4 @@ +import { Typography } from '@equinor/eds-core-react'; import * as Styled from './ImageView.styled'; export const ImageView = ({ @@ -12,7 +13,7 @@ export const ImageView = ({ return ( {altText} -
{text}
+ {text}
); }; diff --git a/src/features/AppBar/AppBar.styled.ts b/src/features/AppBar/AppBar.styled.ts index f446cd47..289c771c 100644 --- a/src/features/AppBar/AppBar.styled.ts +++ b/src/features/AppBar/AppBar.styled.ts @@ -5,4 +5,9 @@ import { spacings } from '../../tokens/spacings'; const StyledTopBar = styled(TopBar)` column-gap: ${spacings.X_LARGE}; `; -export { StyledTopBar as TopBar }; + +const StyledHeader = styled(TopBar.Header)` + cursor: pointer; +`; + +export { StyledHeader as Header, StyledTopBar as TopBar }; diff --git a/src/features/AppBar/AppBar.tsx b/src/features/AppBar/AppBar.tsx index 5adb361c..96ff67f5 100644 --- a/src/features/AppBar/AppBar.tsx +++ b/src/features/AppBar/AppBar.tsx @@ -1,12 +1,21 @@ import { TopBar } from '@equinor/eds-core-react'; +import { useNavigate } from 'react-router-dom'; import * as Styled from './AppBar.styled'; import { Icons } from './Icons/Icons'; import { Navigation } from './Navigation/Navigation'; const AppBar = ({ title }: { title: string }) => { + const navigate = useNavigate(); + return ( - {title} + { + navigate(''); + }} + > + {title} + diff --git a/src/features/Compute/CaseGroup/CaseGroup.styled.tsx b/src/features/Compute/CaseGroup/CaseGroup.styled.tsx index 4347fa1a..8393fea8 100644 --- a/src/features/Compute/CaseGroup/CaseGroup.styled.tsx +++ b/src/features/Compute/CaseGroup/CaseGroup.styled.tsx @@ -1,23 +1,5 @@ import styled from 'styled-components'; import { spacings } from '../../../tokens/spacings'; -import { theme } from '../../../tokens/theme'; - -export const Parameters = styled.div` - display: flex; - flex-direction: column; - row-gap: ${spacings.MEDIUM}; - - padding: ${spacings.LARGE}; - background-color: ${theme.light.ui.background.light}; - border-radius: 0 0 ${spacings.CARD_ROUNDED} 0; -`; - -export const Wrapper = styled.div` - border-left: solid; - border-width: ${spacings.SMALL}; - border-color: ${theme.light.primary.resting}; - border-radius: ${spacings.BORDER_ROUNDED}; -`; export const CaseList = styled.div` display: flex; diff --git a/src/features/ModelTable/ModelTable.tsx b/src/features/ModelTable/ModelTable.tsx index 7676f3d1..4387cf1f 100644 --- a/src/features/ModelTable/ModelTable.tsx +++ b/src/features/ModelTable/ModelTable.tsx @@ -29,7 +29,7 @@ export const ModelTable = ({ if (token) OpenAPI.TOKEN = token; const navigate = useNavigate(); - const [toggle, setToggle] = useState(false); + const [open, setOpen] = useState(false); const [activeModel, setActiveModel] = useState(); const { isLoading, data } = useQuery({ queryKey: ['analogue-models'], @@ -145,6 +145,7 @@ export const ModelTable = ({ id: 'isProcessed', header: 'Status', enableColumnFilter: false, + size: 50, cell: ({ row }) => ( <> {isActiveModel(row.original.analogueModelId) ? ( @@ -173,8 +174,8 @@ export const ModelTable = ({ id: 'navigate', enableColumnFilter: false, enableResizing: false, + maxSize: 220, size: 200, - minSize: 200, cell: ({ row }) => (