Merge pull request #1016 from aehrc/fix/various-fixes

Fix renderer background to be #fafafa
aehrc · Sep 18, 2024 · 6309fbf · 6309fbf
2 parents 947da12 + 1195ee0
commit 6309fbf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/apps/smart-forms-app/src/theme/palette.ts b/apps/smart-forms-app/src/theme/palette.ts
@@ -80,7 +80,7 @@ const palette: PaletteOptions = {
   },
   background: {
     paper: '#fff',
-    default: grey['50']
+    default: '#fafafa'
   },
   customBackground: {
     neutral: '#F4F6F8'

diff --git a/packages/smart-forms-renderer/src/components/Renderer/FormTopLevelItem.tsx b/packages/smart-forms-renderer/src/components/Renderer/FormTopLevelItem.tsx
@@ -175,14 +175,16 @@ function FormTopLevelItem(props: FormTopLevelItemProps) {
   const itemRepeatsAndIsNotCheckbox = isRepeatItemAndNotCheckbox(topLevelQItem);
   if (itemRepeatsAndIsNotCheckbox) {
     return (
-      <RepeatItem
-        key={topLevelQItem.linkId}
-        qItem={topLevelQItem}
-        qrItem={topLevelQRItem}
-        groupCardElevation={1}
-        parentIsReadOnly={readOnly}
-        onQrItemChange={onQrItemChange}
-      />
+      <Box mt={1}>
+        <RepeatItem
+          key={topLevelQItem.linkId}
+          qItem={topLevelQItem}
+          qrItem={topLevelQRItem}
+          groupCardElevation={1}
+          parentIsReadOnly={readOnly}
+          onQrItemChange={onQrItemChange}
+        />
+      </Box>
     );
   }
 

diff --git a/packages/smart-forms-renderer/src/stories/storybookWrappers/BuildFormButtonForStorybook.tsx b/packages/smart-forms-renderer/src/stories/storybookWrappers/BuildFormButtonForStorybook.tsx
@@ -44,7 +44,7 @@ function BuildFormButtonForStorybook(props: BuildFormButtonProps) {
     <Box display="flex" mb={0.5} alignItems="center" columnGap={3}>
       <Tooltip title="Build form with questionnaire response" placement="right">
         <IconButton onClick={handleBuildForm} size="small" color="primary">
-          <Iconify icon="ph:hammer" sx={{ mb: 0.5 }} />
+          <Iconify icon="ph:hammer" />
         </IconButton>
       </Tooltip>
     </Box>

diff --git a/packages/smart-forms-renderer/src/theme/palette.ts b/packages/smart-forms-renderer/src/theme/palette.ts
@@ -77,10 +77,6 @@ const palette: PaletteOptions = {
     secondary: grey['600'],
     disabled: grey['500']
   },
-  background: {
-    paper: '#fff',
-    default: grey['50']
-  },
   customBackground: {
     neutral: '#F4F6F8'
   },