diff --git a/projects/mercury/src/App.theme.js b/projects/mercury/src/App.theme.js index 4d2fbbeef..1f4d4b25b 100644 --- a/projects/mercury/src/App.theme.js +++ b/projects/mercury/src/App.theme.js @@ -13,11 +13,18 @@ const globalTheme = createTheme({ primary: { main: COLORS.fsBlueMedium, light: COLORS.fsBlueLight, - dark: COLORS.fsBlueDark + dark: COLORS.fsBlueDark, + contrastText: 'white' + }, + secondary: { + main: '#758bfd' + }, + error: pink, + success: { + main: '#08a045' }, - secondary: pink, background: { - default: '#d9d9d9' + default: '#eef0eb' } } }); @@ -25,6 +32,7 @@ const globalTheme = createTheme({ export default createTheme({ ...globalTheme, typography: { + fontFamily: ['Sora', 'Palanquin'].join(','), button: { textTransform: 'none' } @@ -115,20 +123,43 @@ export default createTheme({ styleOverrides: { root: { background: globalTheme.palette.primary.dark, + '&:hover': { + background: globalTheme.palette.primary.light + }, borderRadius: 15, borderColor: globalTheme.palette.primary.light, paddingBottom: 0, paddingTop: 0, minHeight: 35 + }, + text: { + color: globalTheme.palette.primary.contrastText } } }, MuiCardHeader: { styleOverrides: { root: { - backgroundColor: 'whitesmoke', + backgroundColor: globalTheme.palette.primary.dark, marginBottom: 0, - padding: 5 + padding: 5, + borderRadius: 15 + }, + title: { + color: globalTheme.palette.primary.contrastText + }, + avatar: { + color: globalTheme.palette.primary.contrastText + }, + subheader: { + color: globalTheme.palette.primary.contrastText + } + } + }, + MuiCardContent: { + styleOverrides: { + root: { + borderRadius: 15 } } }, @@ -157,15 +188,10 @@ export default createTheme({ styleOverrides: { root: { backgroundColor: globalTheme.palette.background.default, - // borderRadius: 15, border: '1px solid', borderColor: globalTheme.palette.primary.dark - } - } - }, - MuiBox: { - styleOverrides: { - root: { + }, + rounded: { borderRadius: 15 } } diff --git a/projects/mercury/src/collections/CollectionsPage.js b/projects/mercury/src/collections/CollectionsPage.js index 9e24b965b..de65b70dc 100644 --- a/projects/mercury/src/collections/CollectionsPage.js +++ b/projects/mercury/src/collections/CollectionsPage.js @@ -98,7 +98,7 @@ const CollectionsPage = (props: CollectionsPageProperties) => { {showMetadataSearchButton && ( - + diff --git a/projects/mercury/src/collections/CollectionsPage.styles.js b/projects/mercury/src/collections/CollectionsPage.styles.js index e3c5d50b7..3e8cf9c57 100644 --- a/projects/mercury/src/collections/CollectionsPage.styles.js +++ b/projects/mercury/src/collections/CollectionsPage.styles.js @@ -6,9 +6,13 @@ const styles = () => ({ width: consts.MAIN_CONTENT_WIDTH }, topBarSwitch: { + paddingLeft: 8, textAlign: 'right', whiteSpace: 'nowrap' }, + metadataButton: { + paddingRight: 8 + }, centralPanel: { width: consts.MAIN_CONTENT_WIDTH, maxHeight: consts.MAIN_CONTENT_MAX_HEIGHT diff --git a/projects/mercury/src/dashboard/DomainInfo.styles.js b/projects/mercury/src/dashboard/DomainInfo.styles.js index 7865f0813..996eb64a0 100644 --- a/projects/mercury/src/dashboard/DomainInfo.styles.js +++ b/projects/mercury/src/dashboard/DomainInfo.styles.js @@ -4,6 +4,7 @@ const styles = theme => ({ height: '100px', borderStyle: 'solid', borderColor: theme.palette.primary.light, + background: theme.palette.primary.dark, borderWidth: 2, textAlign: 'center' }, @@ -25,7 +26,7 @@ const styles = theme => ({ width: 'inherit' }, domainText: { - color: theme.palette.grey[700] + color: theme.palette.primary.contrastText }, link: { textDecoration: 'none' diff --git a/projects/mercury/src/file/FilesPage.js b/projects/mercury/src/file/FilesPage.js index e38035e24..af84427ee 100644 --- a/projects/mercury/src/file/FilesPage.js +++ b/projects/mercury/src/file/FilesPage.js @@ -150,7 +150,7 @@ export const FilesPage = (props: FilesPageProperties) => { {showMetadataSearchButton && ( - + {({TransitionProps, placement}) => ( @@ -130,7 +154,7 @@ const UserMenu = ({classes}) => { )} - + ); }; diff --git a/projects/mercury/src/metadata/views/MetadataView.styles.js b/projects/mercury/src/metadata/views/MetadataView.styles.js index d8ac4b112..ed8ca0cbe 100644 --- a/projects/mercury/src/metadata/views/MetadataView.styles.js +++ b/projects/mercury/src/metadata/views/MetadataView.styles.js @@ -27,7 +27,8 @@ const styles = theme => ({ textAlign: 'end' }, clearAllButton: { - color: theme.palette.error.main + color: theme.palette.primary.contrastText, + background: theme.palette.primary.main }, activeFilters: { marginBottom: 10 diff --git a/projects/mercury/src/metadata/views/MetadataViewFacetFactory.js b/projects/mercury/src/metadata/views/MetadataViewFacetFactory.js index 20c1bb60a..a68ed0b7d 100644 --- a/projects/mercury/src/metadata/views/MetadataViewFacetFactory.js +++ b/projects/mercury/src/metadata/views/MetadataViewFacetFactory.js @@ -71,7 +71,7 @@ const Facet = (props: MetadataViewFacetProperties) => { const clearFiltersAction = activeFilterValues.length > 0 && ( - + ); diff --git a/projects/mercury/src/metadata/views/MetadataViewFacets.js b/projects/mercury/src/metadata/views/MetadataViewFacets.js index fa316d4e3..8b8e024f2 100644 --- a/projects/mercury/src/metadata/views/MetadataViewFacets.js +++ b/projects/mercury/src/metadata/views/MetadataViewFacets.js @@ -25,7 +25,8 @@ const styles = theme => ({ width: 265 }, confirmFiltersButton: { - width: '100%' + width: '100%', + background: theme.palette.primary.main }, facetsContainer: { maxHeight: 'calc(100vh - 212px)', @@ -47,7 +48,7 @@ const styles = theme => ({ facet: { borderColor: theme.palette.primary.light, borderWidth: 1.8, - borderRadius: 6, + borderRadius: 15, marginLeft: 8, marginTop: 6 } diff --git a/projects/mercury/src/metadata/views/MetadataViewTableContainer.js b/projects/mercury/src/metadata/views/MetadataViewTableContainer.js index f133a76fd..72b08d2be 100644 --- a/projects/mercury/src/metadata/views/MetadataViewTableContainer.js +++ b/projects/mercury/src/metadata/views/MetadataViewTableContainer.js @@ -3,7 +3,7 @@ import { CircularProgress, FormControlLabel, IconButton, - Paper, + Box, TableContainer, TablePagination, Tooltip, @@ -20,6 +20,7 @@ import CheckBoxIcon from '@mui/icons-material/CheckBox'; import GetAppIcon from '@mui/icons-material/GetApp'; import FormGroup from '@mui/material/FormGroup'; import useDeepCompareEffect from 'use-deep-compare-effect'; +import {useTheme} from '@mui/material/styles'; import type {MetadataViewColumn, MetadataViewFilter} from './MetadataViewAPI'; import MessageDisplay from '../../common/components/MessageDisplay'; @@ -105,6 +106,7 @@ export const MetadataViewTableContainer = (props: MetadataViewTableContainerProp const exportToAnalysisEnabled = isFeatureEnabled('ExtraStorage'); const [exportToAnalysisLoading, setExportToAnalysisLoading] = useState(false); const [currentSelectionExported, setCurrentSelectionExported] = useState(false); + const theme = useTheme(); const [page, setPage] = useState(0); const [visibleColumnNames, setVisibleColumnNames] = useStateWithLocalStorage( @@ -357,7 +359,14 @@ export const MetadataViewTableContainer = (props: MetadataViewTableContainerProp : 0; return ( - + {renderTableSettings()} - + ); };