diff --git a/src/client/components/facet_results/ResultTable.js b/src/client/components/facet_results/ResultTable.js index 842a71a97c11f401f7d2de188ae873752dabe293..d831aaebde7e0e9137d5fe03d87c6173e841a358 100644 --- a/src/client/components/facet_results/ResultTable.js +++ b/src/client/components/facet_results/ResultTable.js @@ -45,7 +45,7 @@ const styles = theme => ({ [theme.breakpoints.down(480)]: { display: 'flex', flexWrap: 'wrap', - height: 60 + marginTop: theme.spacing(0.5) } }), progressContainer: { diff --git a/src/client/components/facet_results/ResultTablePaginationActions.js b/src/client/components/facet_results/ResultTablePaginationActions.js index 4545e63937542b8d1dcb0d6ddfb4488bfec6db2d..b7b85739704fac693c437d8cf1254a4d1ab1d388 100644 --- a/src/client/components/facet_results/ResultTablePaginationActions.js +++ b/src/client/components/facet_results/ResultTablePaginationActions.js @@ -10,8 +10,7 @@ import LastPageIcon from '@material-ui/icons/LastPage' const styles = theme => ({ root: { flexShrink: 0, - color: theme.palette.text.secondary, - marginLeft: theme.spacing(2.5) + color: theme.palette.text.secondary } }) diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js index 1c2d0f0ddd34499bb2a62bbfeef7a2dfdcece53b..56330a1bf55c24d27ced829e1914ca96dacb3683 100644 --- a/src/client/containers/SemanticPortal.js +++ b/src/client/containers/SemanticPortal.js @@ -99,12 +99,9 @@ const Footer = lazy(() => import(`../components/perspectives/${portalID}/Footer` const useStyles = makeStyles(theme => ({ root: { - /* Background color of the app. - In order to use both 'auto' and '100%' heights, bg-color - needs to be defined also in index.html (for #app and #root elements) - */ backgroundColor: '#bdbdbd', overflowX: 'hidden', + minHeight: '100%', [theme.breakpoints.up(layoutConfig.hundredPercentHeightBreakPoint)]: { overflow: 'hidden', height: '100%' diff --git a/src/client/index.css b/src/client/index.css index 21cb0ec6d82e683d13482e9a2f0dbfc39e7aff22..38b9373d339346b082084d78e037c74a24a273cb 100644 --- a/src/client/index.css +++ b/src/client/index.css @@ -1,4 +1,4 @@ -html, body, #root, #app { +html, body, #root { height: 100%; } diff --git a/src/client/index.js b/src/client/index.js index 3c5a3adf4e7b90f6e38c6d2d947304a581025a68..35be674ebf0960477f5f21a24f0f8d5ba0bf48ce 100644 --- a/src/client/index.js +++ b/src/client/index.js @@ -44,34 +44,32 @@ store.dispatch(loadLocales(locale)) render( <Provider store={store}> - <div id='app'> - <Router history={history}> - <Suspense - fallback={ - <div style={{ - width: '100%', - height: '100%', - display: 'flex', - alignItems: 'center', - justifyContent: 'center' - }} - > - <CircularProgress style={{ color: purple[500] }} thickness={5} /> - </div> + <Router history={history}> + <Suspense + fallback={ + <div style={{ + width: '100%', + height: '100%', + display: 'flex', + alignItems: 'center', + justifyContent: 'center' + }} + > + <CircularProgress style={{ color: purple[500] }} thickness={5} /> + </div> } - > - <App /> - </Suspense> - </Router> - <ReduxToastr - timeOut={0} - newestOnTop={false} - preventDuplicates - position='top-center' - transitionIn='fadeIn' - transitionOut='fadeOut' - /> - </div> + > + <App /> + </Suspense> + </Router> + <ReduxToastr + timeOut={0} + newestOnTop={false} + preventDuplicates + position='top-center' + transitionIn='fadeIn' + transitionOut='fadeOut' + /> </Provider>, document.getElementById('root') )