diff --git a/projects/mercury/src/common/components/LoadingOverlayWrapper.js b/projects/mercury/src/common/components/LoadingOverlayWrapper.js index 71e69a7bf..5871a5b50 100644 --- a/projects/mercury/src/common/components/LoadingOverlayWrapper.js +++ b/projects/mercury/src/common/components/LoadingOverlayWrapper.js @@ -23,12 +23,13 @@ const useStyles = makeStyles(theme => ({ opacity: 0.4 }, backdrop: { - backgroundColor: '#747474', + backgroundColor: theme.palette.mellow.dark, position: 'absolute', top: 0, left: 0, width: '100%', - height: '100%' + height: '100%', + borderRadius: theme.shape.borderRadius } })); diff --git a/projects/mercury/src/file/FileOperations.styles.js b/projects/mercury/src/file/FileOperations.styles.js index e73985633..8b912a725 100644 --- a/projects/mercury/src/file/FileOperations.styles.js +++ b/projects/mercury/src/file/FileOperations.styles.js @@ -6,11 +6,15 @@ const styles = () => ({ '& .MuiListItem-root': { paddingTop: 4, paddingBottom: 4 + }, + '& .MuiDivider-root': { + marginTop: 2, + marginBottom: 0 } }, uploadMenuHelper: { borderLeft: '8px solid #999', - padding: 20 + padding: '5px 10px 5px 10px' }, uploadMenuHelperText: { margin: 0, diff --git a/projects/mercury/src/metadata/common/LinkedDataValuesList.styles.js b/projects/mercury/src/metadata/common/LinkedDataValuesList.styles.js index c2037622d..99689b0e8 100644 --- a/projects/mercury/src/metadata/common/LinkedDataValuesList.styles.js +++ b/projects/mercury/src/metadata/common/LinkedDataValuesList.styles.js @@ -7,15 +7,27 @@ const styles = theme => ({ fontSize: '0.875rem', lineHeight: 1.43, letterSpacing: '0.01071em', + '& .MuiInputBase-root': { + backgroundColor: alpha(theme.palette.primary.main, 0.15), + '&:hover': { + backgroundColor: alpha(theme.palette.primary.main, 0.25), + borderColor: theme.palette.primary.main + } + }, '& input': { fontSize: '0.875rem', lineHeight: 1.43, - letterSpacing: '0.01071em' + letterSpacing: '0.01071em', + overflow: 'hidden' + }, + '& .MuiOutlinedInput-input': { + borderRadius: theme.shape.borderRadius }, '& textarea': { fontSize: '0.875rem', lineHeight: 1.43, - letterSpacing: '0.01071em' + letterSpacing: '0.01071em', + borderRadius: theme.shape.borderRadius } }, addValue: { @@ -32,13 +44,7 @@ const styles = theme => ({ } }, addValueInput: { - borderRadius: theme.shape.borderRadius, - backgroundColor: alpha(theme.palette.primary.main, 0.15), - opacity: 0.8, - '&:hover': { - backgroundColor: alpha(theme.palette.primary.main, 0.25), - borderColor: theme.palette.primary.main - } + borderRadius: theme.shape.borderRadius } }); diff --git a/projects/mercury/src/permissions/UserPermissionsTable.js b/projects/mercury/src/permissions/UserPermissionsTable.js index bbf3d898c..a34a77ed9 100644 --- a/projects/mercury/src/permissions/UserPermissionsTable.js +++ b/projects/mercury/src/permissions/UserPermissionsTable.js @@ -43,7 +43,10 @@ const styles = { }, accessCell: { padding: 0, - minWidth: 100 + minWidth: 100, + '& .MuiOutlinedInput-input': { + padding: 5 + } } };