From 6d60814971e9265c282dfa5a37594a7101cabb0d Mon Sep 17 00:00:00 2001
From: Joseph John Aas Cooper <33054985+cooper-joe@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:29:24 +0100
Subject: [PATCH] fix: adjust form container styles

---
 src/components/form/DefaultFormContents.module.css | 1 +
 src/components/form/DefaultFormContents.tsx        | 9 ++++-----
 src/pages/dataElementGroupSets/Edit.module.css     | 1 +
 src/pages/dataElementGroupSets/New.module.css      | 1 +
 src/pages/dataElementGroups/Edit.module.css        | 1 +
 src/pages/dataElementGroups/New.module.css         | 1 +
 src/pages/dataElements/Edit.module.css             | 1 +
 src/pages/dataElements/New.module.css              | 1 +
 8 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/form/DefaultFormContents.module.css b/src/components/form/DefaultFormContents.module.css
index e024e3cc..bf5221e7 100644
--- a/src/components/form/DefaultFormContents.module.css
+++ b/src/components/form/DefaultFormContents.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }
diff --git a/src/components/form/DefaultFormContents.tsx b/src/components/form/DefaultFormContents.tsx
index 789679be..855ac2e7 100644
--- a/src/components/form/DefaultFormContents.tsx
+++ b/src/components/form/DefaultFormContents.tsx
@@ -1,5 +1,4 @@
 import i18n from '@dhis2/d2-i18n'
-import { Card } from '@dhis2/ui'
 import React from 'react'
 import { useFormState } from 'react-final-form'
 import { getSectionPath, useNavigateWithSearchState } from '../../lib'
@@ -24,13 +23,13 @@ export function DefaultEditFormContents({
 
     return (
         <>
-            <Card className={classes.form}>
+            <div className={classes.form}>
                 {children}
 
                 <StandardFormSection>
                     <DefaultFormErrorNotice />
                 </StandardFormSection>
-            </Card>
+            </div>
             <div className={classes.formActions}>
                 <StandardFormActions
                     cancelLabel={i18n.t('Cancel')}
@@ -59,7 +58,7 @@ export function DefaultNewFormContents({
     const listPath = `/${getSectionPath(section)}`
 
     return (
-        <Card className={classes.form}>
+        <div className={classes.form}>
             {children}
             <StandardFormSection>
                 <DefaultFormErrorNotice />
@@ -72,6 +71,6 @@ export function DefaultNewFormContents({
                 submitting={submitting}
                 onCancelClick={() => navigate(listPath)}
             />
-        </Card>
+        </div>
     )
 }
diff --git a/src/pages/dataElementGroupSets/Edit.module.css b/src/pages/dataElementGroupSets/Edit.module.css
index e024e3cc..bf5221e7 100644
--- a/src/pages/dataElementGroupSets/Edit.module.css
+++ b/src/pages/dataElementGroupSets/Edit.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }
diff --git a/src/pages/dataElementGroupSets/New.module.css b/src/pages/dataElementGroupSets/New.module.css
index 331dde3d..0c810796 100644
--- a/src/pages/dataElementGroupSets/New.module.css
+++ b/src/pages/dataElementGroupSets/New.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }
diff --git a/src/pages/dataElementGroups/Edit.module.css b/src/pages/dataElementGroups/Edit.module.css
index e024e3cc..bf5221e7 100644
--- a/src/pages/dataElementGroups/Edit.module.css
+++ b/src/pages/dataElementGroups/Edit.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }
diff --git a/src/pages/dataElementGroups/New.module.css b/src/pages/dataElementGroups/New.module.css
index 331dde3d..0c810796 100644
--- a/src/pages/dataElementGroups/New.module.css
+++ b/src/pages/dataElementGroups/New.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }
diff --git a/src/pages/dataElements/Edit.module.css b/src/pages/dataElements/Edit.module.css
index e024e3cc..bf5221e7 100644
--- a/src/pages/dataElements/Edit.module.css
+++ b/src/pages/dataElements/Edit.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }
diff --git a/src/pages/dataElements/New.module.css b/src/pages/dataElements/New.module.css
index 331dde3d..0c810796 100644
--- a/src/pages/dataElements/New.module.css
+++ b/src/pages/dataElements/New.module.css
@@ -1,5 +1,6 @@
 .form {
     background: var(--colors-white);
+    border: 1px solid var(--colors-grey300);
     padding: var(--spacers-dp16);
     padding-bottom: var(--spacers-dp32);
 }