fix

navikt · Dec 17, 2024 · 08061fc · 08061fc
1 parent 05902a2
commit 08061fc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/src/app/søknader/omsorgspenger-utbetaling/components/Frilanser.tsx b/src/app/søknader/omsorgspenger-utbetaling/components/Frilanser.tsx
@@ -35,7 +35,6 @@ export default function Frilanser() {
                     <FormattedMessage id={'omsorgspenger.utbetaling.frilanser.tittel'} />
                 </Heading>
 
-                <VerticalSpacer twentyPx />
                 <Box padding="4">
                     {!values.erKorrigering && (
                         <>
@@ -75,15 +74,15 @@ export default function Frilanser() {
                                     value="ja"
                                     onChange={() => form.setFieldValue(field.name, true)}
                                 >
-                                    <FormattedMessage id={'omsorgspenger.utbetaling.frilanser.jobberFortsatt.ja'} />
+                                    <FormattedMessage id="omsorgspenger.utbetaling.frilanser.jobberFortsatt.ja" />
                                 </RadioFormik>
 
                                 <RadioFormik
                                     name={field.name}
                                     value="nei"
                                     onChange={() => form.setFieldValue(field.name, false)}
                                 >
-                                    <FormattedMessage id={'omsorgspenger.utbetaling.frilanser.jobberFortsatt.nei'} />
+                                    <FormattedMessage id="omsorgspenger.utbetaling.frilanser.jobberFortsatt.nei" />
                                 </RadioFormik>
                             </RadioGroupFormik>
                         )}
@@ -104,8 +103,10 @@ export default function Frilanser() {
 
                     <hr />
 
+                    <VerticalSpacer twentyPx />
+
                     <Heading size="small">
-                        <FormattedMessage id={'omsorgspenger.utbetaling.frilanser.fravaersperioder.tittel'} />
+                        <FormattedMessage id="omsorgspenger.utbetaling.frilanser.fravaersperioder.tittel" />
                     </Heading>
 
                     <FieldArray
@@ -132,9 +133,7 @@ export default function Frilanser() {
                                     }
                                     icon={<AddCircle />}
                                 >
-                                    <FormattedMessage
-                                        id={'omsorgspenger.utbetaling.frilanser.fravaersperioder.leggTil.btn'}
-                                    />
+                                    <FormattedMessage id="omsorgspenger.utbetaling.frilanser.fravaersperioder.leggTil.btn" />
                                 </Button>
                             </>
                         )}

diff --git a/src/app/søknader/omsorgspenger-utbetaling/components/Medlemskap.tsx b/src/app/søknader/omsorgspenger-utbetaling/components/Medlemskap.tsx
@@ -40,22 +40,24 @@ const Medlemskap: React.FC = () => {
                 <FormattedMessage id="omsorgspenger.utbetaling.medlemskap.tittel" />
             </Heading>
 
-            <Box padding="4">
-                <RadioPanelGruppeFormik
-                    legend={intlHelper(intl, 'skjema.medlemskap.harbodd')}
-                    name="metadata.medlemskap"
-                    options={options}
-                />
-
-                {values.metadata.medlemskap === JaNeiIkkeOpplyst.JA && (
+            <VerticalSpacer twentyPx />
+
+            <RadioPanelGruppeFormik
+                legend={intlHelper(intl, 'skjema.medlemskap.harbodd')}
+                name="metadata.medlemskap"
+                options={options}
+            />
+
+            <VerticalSpacer twentyPx />
+
+            {values.metadata.medlemskap === JaNeiIkkeOpplyst.JA && (
+                <Box padding="4" borderRadius="small" style={{ backgroundColor: '#eaeaea' }}>
                     <FieldArray
                         name="bosteder"
                         render={(arrayHelpers) => (
                             <>
                                 {values.bosteder?.map((_, bostedIndex, array) => (
                                     <div key={bostedIndex}>
-                                        <VerticalSpacer thirtyTwoPx />
-
                                         <div className="fom-tom-rad">
                                             <DatoInputFormikNew
                                                 label={intlHelper(
@@ -119,8 +121,8 @@ const Medlemskap: React.FC = () => {
                             </>
                         )}
                     />
-                )}
-            </Box>
+                </Box>
+            )}
         </Box>
     );
 };

diff --git a/src/app/søknader/omsorgspenger-utbetaling/components/Utenlandsopphold.tsx b/src/app/søknader/omsorgspenger-utbetaling/components/Utenlandsopphold.tsx
@@ -39,22 +39,24 @@ const Utenlandsopphold: React.FC = () => {
                 <FormattedMessage id="omsorgspenger.utbetaling.utenlandsopphold.tittel" />
             </Heading>
 
-            <Box padding="4">
-                <RadioPanelGruppeFormik
-                    legend={intlHelper(intl, 'skjema.utenlandsopphold.label')}
-                    name="metadata.utenlandsopphold"
-                    options={options}
-                />
-
-                {values.metadata.utenlandsopphold === JaNeiIkkeOpplyst.JA && (
+            <VerticalSpacer twentyPx />
+
+            <RadioPanelGruppeFormik
+                legend={intlHelper(intl, 'skjema.utenlandsopphold.label')}
+                name="metadata.utenlandsopphold"
+                options={options}
+            />
+
+            <VerticalSpacer twentyPx />
+
+            {values.metadata.utenlandsopphold === JaNeiIkkeOpplyst.JA && (
+                <Box padding="4" borderRadius="small" style={{ backgroundColor: '#eaeaea' }}>
                     <FieldArray
                         name="utenlandsopphold"
                         render={(arrayHelpers) => (
                             <>
                                 {values.utenlandsopphold?.map((_, index, array) => (
                                     <div key={index}>
-                                        <VerticalSpacer thirtyTwoPx />
-
                                         <div className="fom-tom-rad">
                                             <DatoInputFormikNew
                                                 label={intlHelper(
@@ -118,8 +120,8 @@ const Utenlandsopphold: React.FC = () => {
                             </>
                         )}
                     />
-                )}
-            </Box>
+                </Box>
+            )}
         </Box>
     );
 };