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 => { About - + {APPLICATION_NAME} version: {process.env.REACT_APP_VERSION} 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/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}) => ( - + {label} ); 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', 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 e395203ed..64fed29f2 100644 --- a/projects/mercury/src/metadata/views/MetadataViewTableContainer.js +++ b/projects/mercury/src/metadata/views/MetadataViewTableContainer.js @@ -80,7 +80,8 @@ const styles = theme => ({ overflowX: 'auto', '& .MuiTableCell-stickyHeader': { backgroundColor: theme.palette.background.default - } + }, + borderRadius: theme.shape.borderRadius }, tableFooter: { flex: 1