From c71c724f78c89059663d3ae218075224173bd97c Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Thu, 3 Aug 2023 10:33:26 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Gjort=20endringer=20p=C3=A5=20Mo?= =?UTF-8?q?dal=20layout=20og=20lagt=20til=20header=20p=C3=A5=20redigering?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/FeilModal.tsx | 2 +- .../src/components/FeilmeldingsInnhold.tsx | 11 +++++---- .../src/components/RedigeringsVerktoy.tsx | 24 ++++++++++++------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/FeilModal.tsx b/frontend/src/components/FeilModal.tsx index 89069c5..e7eb4a3 100644 --- a/frontend/src/components/FeilModal.tsx +++ b/frontend/src/components/FeilModal.tsx @@ -11,7 +11,7 @@ interface modalInterface { const FeilModal = (props: modalInterface) => { return( props.setOpen(false)} diff --git a/frontend/src/components/FeilmeldingsInnhold.tsx b/frontend/src/components/FeilmeldingsInnhold.tsx index 50384ac..9d0bbfc 100644 --- a/frontend/src/components/FeilmeldingsInnhold.tsx +++ b/frontend/src/components/FeilmeldingsInnhold.tsx @@ -2,11 +2,12 @@ import { PencilIcon, XMarkIcon } from "@navikt/aksel-icons" import { Button } from "@navikt/ds-react" import { FeilmeldingsInnholdInterface } from "../interface" import FeilkortHeader from "./FeilkortHeader" +import Skillelinje from "./Skillelinje" const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { return( -
-
+ <> +
{ onClick={() => { props.setVisModal(false) props.setRedigeringsmodus(false) - } } + }} > Lukk
-
+ {props.children} -
+ ) } export default FeilmeldingsInnhold; diff --git a/frontend/src/components/RedigeringsVerktoy.tsx b/frontend/src/components/RedigeringsVerktoy.tsx index 90968a2..f9ca506 100644 --- a/frontend/src/components/RedigeringsVerktoy.tsx +++ b/frontend/src/components/RedigeringsVerktoy.tsx @@ -42,8 +42,12 @@ const RedigeringsVerktoy = (props: redigeringsInterface) => { } return ( -
-
+
+ +
+ + Rediger feil + { Feilen er fikset - - Haster det å fikse feilen? - - setHaster(!haster)}> - Feilen haster - +
+ + Haster det å fikse feilen? + + setHaster(!haster)}> + Feilen haster + +
-
+