From 05c103c35f0f0b67f85b5d5e2cc06fdc13f465d4 Mon Sep 17 00:00:00 2001
From: ewelinagr <ewelina@thehyve.nl>
Date: Thu, 8 Aug 2024 16:45:51 +0200
Subject: [PATCH 1/2] Implement UI 2.0 feedback.

---
 projects/mercury/src/dashboard/DashboardPage.js     | 2 +-
 projects/mercury/src/dashboard/DomainInfo.styles.js | 3 ++-
 projects/mercury/src/layout/Layout.styles.js        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/mercury/src/dashboard/DashboardPage.js b/projects/mercury/src/dashboard/DashboardPage.js
index 45a7b1a90..066d29b0f 100644
--- a/projects/mercury/src/dashboard/DashboardPage.js
+++ b/projects/mercury/src/dashboard/DashboardPage.js
@@ -85,7 +85,7 @@ const DashboardPage = props => {
                             <Typography className={classes.header} variant="h4" paragraph align="center">
                                 About
                             </Typography>
-                            <Typography variant="body1" paragraph>
+                            <Typography variant="body1" paragraph align="center">
                                 {APPLICATION_NAME} version: {process.env.REACT_APP_VERSION}
                             </Typography>
                             <Typography variant="body2" paragraph className={classes.footer} align="center">
diff --git a/projects/mercury/src/dashboard/DomainInfo.styles.js b/projects/mercury/src/dashboard/DomainInfo.styles.js
index ba0cfe4ce..cb4b03af5 100644
--- a/projects/mercury/src/dashboard/DomainInfo.styles.js
+++ b/projects/mercury/src/dashboard/DomainInfo.styles.js
@@ -14,7 +14,8 @@ const styles = theme => ({
     },
     icon: {
         marginLeft: 10,
-        marginTop: 10
+        marginTop: 10,
+        color: theme.palette.primary.contrastText
     },
     imageIconRoot: {
         marginTop: 10,
diff --git a/projects/mercury/src/layout/Layout.styles.js b/projects/mercury/src/layout/Layout.styles.js
index 56203e2a4..0e1728326 100644
--- a/projects/mercury/src/layout/Layout.styles.js
+++ b/projects/mercury/src/layout/Layout.styles.js
@@ -3,7 +3,7 @@ const styles = theme => ({
         backgroundColor: theme.palette.background.default,
         paddingTop: 14,
         paddingBottom: 14,
-        paddingRight: 0,
+        paddingRight: 8,
         minWidth: 0, // So the Typography noWrap works
         overflowY: 'scroll',
         overflowX: 'hidden',

From eaba4813b7cd6d9483701927412afd2f6b342423 Mon Sep 17 00:00:00 2001
From: ewelinagr <ewelina@thehyve.nl>
Date: Fri, 9 Aug 2024 10:46:59 +0200
Subject: [PATCH 2/2] Fix metadata table header.

---
 projects/mercury/src/file/FileVersionsList.js              | 7 +------
 projects/mercury/src/metadata/views/MetadataViewTable.js   | 5 -----
 .../src/metadata/views/MetadataViewTableContainer.js       | 3 ++-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/projects/mercury/src/file/FileVersionsList.js b/projects/mercury/src/file/FileVersionsList.js
index d48ca2cd5..259bdfcc9 100644
--- a/projects/mercury/src/file/FileVersionsList.js
+++ b/projects/mercury/src/file/FileVersionsList.js
@@ -176,12 +176,7 @@ const FileVersionsList = ({selectedFile, onRevertVersion, isWritingEnabled, clas
     );
 
     const renderHeader = ({label}) => (
-        <TableCell
-            component="div"
-            className={`${classes.tableCell} ${classes.tableHeaderRow}`}
-            variant="head"
-            align="left"
-        >
+        <TableCell component="div" className={classes.tableCell} variant="head" align="left">
             {label}
         </TableCell>
     );
diff --git a/projects/mercury/src/metadata/views/MetadataViewTable.js b/projects/mercury/src/metadata/views/MetadataViewTable.js
index dd241dcc8..3472b5074 100644
--- a/projects/mercury/src/metadata/views/MetadataViewTable.js
+++ b/projects/mercury/src/metadata/views/MetadataViewTable.js
@@ -31,11 +31,6 @@ type MetadataViewTableProperties = {
 };
 
 const useStyles = makeStyles(() => ({
-    headerRow: {
-        '& .MuiTableCell-root': {
-            borderRadius: 20
-        }
-    },
     headerCellContents: {
         verticalAlign: 'top',
         whiteSpace: 'nowrap'
diff --git a/projects/mercury/src/metadata/views/MetadataViewTableContainer.js b/projects/mercury/src/metadata/views/MetadataViewTableContainer.js
index 8430ae1df..4a0eb62b6 100644
--- a/projects/mercury/src/metadata/views/MetadataViewTableContainer.js
+++ b/projects/mercury/src/metadata/views/MetadataViewTableContainer.js
@@ -75,7 +75,8 @@ const styles = theme => ({
         overflowX: 'auto',
         '& .MuiTableCell-stickyHeader': {
             backgroundColor: theme.palette.background.default
-        }
+        },
+        borderRadius: theme.shape.borderRadius
     },
     tableFooter: {
         flex: 1