diff --git a/projects/mercury/src/App.theme.js b/projects/mercury/src/App.theme.js index b2556b3dd..1bf046be5 100644 --- a/projects/mercury/src/App.theme.js +++ b/projects/mercury/src/App.theme.js @@ -25,6 +25,10 @@ const globalTheme = createTheme({ }, background: { default: '#eef0eb' + }, + text: { + primary: COLORS.fsBlueDark, + secondary: COLORS.fsBlueMedium } }, shape: { @@ -32,7 +36,7 @@ const globalTheme = createTheme({ } }); -const scrollbarStyles = { +export const scrollbarStyles = { '&::-webkit-scrollbar': { width: '0.3em', height: '0.3em' @@ -226,6 +230,13 @@ export default createTheme({ ...scrollbarStyles } } + }, + MuiTablePagination: { + styleOverrides: { + root: { + ...scrollbarStyles + } + } } } }); diff --git a/projects/mercury/src/collections/CollectionsPage.styles.js b/projects/mercury/src/collections/CollectionsPage.styles.js index 3e8cf9c57..ab26d2317 100644 --- a/projects/mercury/src/collections/CollectionsPage.styles.js +++ b/projects/mercury/src/collections/CollectionsPage.styles.js @@ -15,7 +15,8 @@ const styles = () => ({ }, centralPanel: { width: consts.MAIN_CONTENT_WIDTH, - maxHeight: consts.MAIN_CONTENT_MAX_HEIGHT + maxHeight: consts.MAIN_CONTENT_MAX_HEIGHT, + paddingLeft: 0 }, sidePanel: { width: consts.SIDE_PANEL_WIDTH diff --git a/projects/mercury/src/layout/MainMenu.js b/projects/mercury/src/layout/MainMenu.js index 43b8d51fe..42b782c8c 100644 --- a/projects/mercury/src/layout/MainMenu.js +++ b/projects/mercury/src/layout/MainMenu.js @@ -14,12 +14,13 @@ import ExternalMetadataSourceContext from '../metadata/metadata-sources/External import {getExternalStoragePathPrefix} from '../external-storage/externalStorageUtils'; import {getExternalMetadataSourcePathPrefix} from '../metadata/external-views/externalMetadataSourceUtils'; import InternalMetadataSourceContext from '../metadata/metadata-sources/InternalMetadataSourceContext'; -import {COLORS} from '../App.theme'; +import {COLORS, scrollbarStyles} from '../App.theme'; const styles = theme => ({ buttonStack: { paddingLeft: 20, - paddingRight: 20 + paddingRight: 20, + overflowY: 'auto' }, buttonStackCollapsed: { paddingLeft: 10, diff --git a/projects/mercury/src/layout/MenuDrawer.js b/projects/mercury/src/layout/MenuDrawer.js index 75c6b324e..c1635e356 100644 --- a/projects/mercury/src/layout/MenuDrawer.js +++ b/projects/mercury/src/layout/MenuDrawer.js @@ -23,7 +23,7 @@ const MenuDrawer = ({open, renderMenu, toggleMenuExpansion, onMouseEnter, onMous )} -