From 29209e302f75c08c0ec03c91c031446dc43ef13f Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Mon, 3 Jan 2022 12:01:23 +0200
Subject: [PATCH] Update min height
---
.../components/facet_results/ResultTable.js | 2 +-
.../ResultTablePaginationActions.js | 3 +-
src/client/containers/SemanticPortal.js | 5 +-
src/client/index.css | 2 +-
src/client/index.js | 52 +++++++++----------
5 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/src/client/components/facet_results/ResultTable.js b/src/client/components/facet_results/ResultTable.js
index 842a71a9..d831aaeb 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 4545e639..b7b85739 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 1c2d0f0d..56330a1b 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 21cb0ec6..38b9373d 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 3c5a3adf..35be674e 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')
)
--
GitLab