Fix: merging after rebase (#595)

DPO3DPKRT-754/notification during upload (#589) DPO3DPKRT-813/UX fixes upload and ingestion (#591) DPO3DPKRT-772/internal publishing to EDAN (#592)
Smithsonian · Jun 4, 2024 · 04e70b3 · 04e70b3
1 parent 4b92a47
commit 04e70b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/src/pages/Ingestion/components/SubjectItem/index.tsx b/client/src/pages/Ingestion/components/SubjectItem/index.tsx
@@ -49,6 +49,7 @@ const useStyles = makeStyles(({ palette }) => ({
         margin: '0.5rem',
         padding: 0
     },
+
     fileChip: {
         marginRight: 10
     },

diff --git a/client/src/pages/Ingestion/components/Uploads/index.tsx b/client/src/pages/Ingestion/components/Uploads/index.tsx
@@ -27,7 +27,7 @@ const useStyles = makeStyles(({ palette, typography, spacing }) => createStyles(
         display: 'flex',
         flex: 1,
         flexDirection: 'column',
-        // overflow: 'auto',
+        // overflow: 'hidden',
         maxHeight: 'calc(100vh - 60px)',
         overflow: 'auto'
     },