From 93c912203a2cd726c84d1de70eda61e6f756980b Mon Sep 17 00:00:00 2001 From: Sverre Blekastad Stensby Date: Thu, 19 Dec 2024 16:20:22 +0100 Subject: [PATCH] =?UTF-8?q?Fikset=20noen=20layouttting=20som=20=C3=B8dela?= =?UTF-8?q?=20ved=20veldig=20h=C3=B8y=20zoom.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/Pages/MineSaker/MineSakerside.tsx | 1 + client/src/Pages/MineSaker/SamarbeidsInnhold.tsx | 1 + .../Kartlegging/BehovsvurderingCardHeaderInnhold.tsx | 3 +++ client/src/Pages/Virksomhet/Plan/InnholdOppsett.tsx | 3 ++- client/src/Pages/Virksomhet/Plan/LeggTilTemaKnapp.tsx | 7 ++++--- .../Samarbeid/Evaluering/EvalueringCardHeaderInnhold.tsx | 1 + .../src/Pages/Virksomhet/Samarbeid/SamarbeidsDropdown.tsx | 2 +- .../IASakStatus/EndreStatusModal/Statusknapper.tsx | 1 + .../VirksomhetsinfoHeader/VirksomhetOgSamarbeidsHeader.tsx | 1 + .../Sp\303\270rreunders\303\270kelse/TemaResultat.tsx" | 4 ++++ 10 files changed, 19 insertions(+), 5 deletions(-) diff --git a/client/src/Pages/MineSaker/MineSakerside.tsx b/client/src/Pages/MineSaker/MineSakerside.tsx index 0c256b7e7..43301fa00 100644 --- a/client/src/Pages/MineSaker/MineSakerside.tsx +++ b/client/src/Pages/MineSaker/MineSakerside.tsx @@ -34,6 +34,7 @@ const MineSakerListe = styled.div` display: flex; flex-direction: column; gap: 1rem; + max-width: 100%; `; diff --git a/client/src/Pages/MineSaker/SamarbeidsInnhold.tsx b/client/src/Pages/MineSaker/SamarbeidsInnhold.tsx index fd57a1026..9385dc2c8 100644 --- a/client/src/Pages/MineSaker/SamarbeidsInnhold.tsx +++ b/client/src/Pages/MineSaker/SamarbeidsInnhold.tsx @@ -15,6 +15,7 @@ const Innhold = styled.div` display: flex; flex-direction: row; align-items: space-between; + flex-wrap: wrap; `; const CardContentLeft = styled.div` diff --git a/client/src/Pages/Virksomhet/Kartlegging/BehovsvurderingCardHeaderInnhold.tsx b/client/src/Pages/Virksomhet/Kartlegging/BehovsvurderingCardHeaderInnhold.tsx index 52a717180..e1ad3acbc 100644 --- a/client/src/Pages/Virksomhet/Kartlegging/BehovsvurderingCardHeaderInnhold.tsx +++ b/client/src/Pages/Virksomhet/Kartlegging/BehovsvurderingCardHeaderInnhold.tsx @@ -42,6 +42,7 @@ const StyledExpansionCardHeader = styled(ExpansionCard.Header)` justify-content: space-between; align-items: flex-start; flex-grow: 1; + flex-wrap: wrap; } `; @@ -62,6 +63,7 @@ const StyledEmptyCardHeader = styled.div` border: var(--__ac-expansioncard-border-width) solid var(--__ac-expansioncard-border-color); justify-content: space-between; + flex-wrap: wrap; `; const HeaderRightContent = styled.span` @@ -69,6 +71,7 @@ const HeaderRightContent = styled.span` align-items: center; font-size: 1rem; align-self: center; + flex-wrap: wrap; `; const BehovsvurderingDato = styled.span` diff --git a/client/src/Pages/Virksomhet/Plan/InnholdOppsett.tsx b/client/src/Pages/Virksomhet/Plan/InnholdOppsett.tsx index c9d5dc280..eb89b28ee 100644 --- a/client/src/Pages/Virksomhet/Plan/InnholdOppsett.tsx +++ b/client/src/Pages/Virksomhet/Plan/InnholdOppsett.tsx @@ -18,7 +18,8 @@ import { loggEndringAvPlan } from "../../../util/amplitude-klient"; const InnholdsRad = styled(HStack)` margin-bottom: 0.5rem; - min-width: 48rem; + max-width: 100%; + flex-wrap: wrap; `; // Noe ødelegger --a-spacing-6 så vi setter det manuelt. Bør ta en titt og finne ut hva som ødelegger det senere. diff --git a/client/src/Pages/Virksomhet/Plan/LeggTilTemaKnapp.tsx b/client/src/Pages/Virksomhet/Plan/LeggTilTemaKnapp.tsx index 3fc6eb27e..6c101e7fa 100644 --- a/client/src/Pages/Virksomhet/Plan/LeggTilTemaKnapp.tsx +++ b/client/src/Pages/Virksomhet/Plan/LeggTilTemaKnapp.tsx @@ -27,6 +27,7 @@ const UndertemaSetupContainer = styled.div` const LeggTilTemaModal = styled(Modal)` max-width: 72rem; + width: 100%; `; export default function LeggTilTemaKnapp({ @@ -164,7 +165,7 @@ export default function LeggTilTemaKnapp({ onClose={() => setModalOpen(false)} aria-label="Legg til tema" > - + @@ -178,7 +179,7 @@ export default function LeggTilTemaKnapp({ return a.id - b.id; }) .map((tema) => ( -
+ {tema.navn} @@ -200,7 +201,7 @@ export default function LeggTilTemaKnapp({ /> )} -
+ ))}
diff --git a/client/src/Pages/Virksomhet/Samarbeid/Evaluering/EvalueringCardHeaderInnhold.tsx b/client/src/Pages/Virksomhet/Samarbeid/Evaluering/EvalueringCardHeaderInnhold.tsx index 9960a41e7..fa87d7b94 100644 --- a/client/src/Pages/Virksomhet/Samarbeid/Evaluering/EvalueringCardHeaderInnhold.tsx +++ b/client/src/Pages/Virksomhet/Samarbeid/Evaluering/EvalueringCardHeaderInnhold.tsx @@ -61,6 +61,7 @@ const StyledEmptyCardHeader = styled.div` border: var(--__ac-expansioncard-border-width) solid var(--__ac-expansioncard-border-color); justify-content: space-between; + flex-wrap: wrap; `; const HeaderRightContent = styled.span` diff --git a/client/src/Pages/Virksomhet/Samarbeid/SamarbeidsDropdown.tsx b/client/src/Pages/Virksomhet/Samarbeid/SamarbeidsDropdown.tsx index 4bde1c38e..10b2a6ea4 100644 --- a/client/src/Pages/Virksomhet/Samarbeid/SamarbeidsDropdown.tsx +++ b/client/src/Pages/Virksomhet/Samarbeid/SamarbeidsDropdown.tsx @@ -73,7 +73,7 @@ export const SamarbeidsDropdown = ({ ` justify-content: space-between; align-items: center; padding: ${(props) => (props.$redusertPadding ? "0.5rem" : "1.5rem")}; + flex-wrap: wrap; `; const EnkeltKnappContainer = styled(Knappecontainer)` diff --git a/client/src/Pages/Virksomhet/Virksomhetsoversikt/VirksomhetsinfoHeader/VirksomhetOgSamarbeidsHeader.tsx b/client/src/Pages/Virksomhet/Virksomhetsoversikt/VirksomhetsinfoHeader/VirksomhetOgSamarbeidsHeader.tsx index 4a29a363e..272fd40d2 100644 --- a/client/src/Pages/Virksomhet/Virksomhetsoversikt/VirksomhetsinfoHeader/VirksomhetOgSamarbeidsHeader.tsx +++ b/client/src/Pages/Virksomhet/Virksomhetsoversikt/VirksomhetsinfoHeader/VirksomhetOgSamarbeidsHeader.tsx @@ -131,6 +131,7 @@ export default function VirksomhetOgSamarbeidsHeader({ placement="right-start" onClose={() => setOpenState(false)} anchorEl={buttonRef.current} + style={{ overflow: "auto" }} >