Commit 2b389506 authored by Lionel Morin's avatar Lionel Morin

Merge branch 'dev_footer' into 'dev'

Add legal footer to public pages

See merge request !172
parents 397c3b91 34c432b8
Pipeline #1851 passed with stages
in 6 minutes and 56 seconds
......@@ -10,28 +10,23 @@ import Articles from '../../../api/articles/articles';
import Spinner from '../../components/system/Spinner';
import { useAppContext } from '../../contexts/context';
import TopBar from '../../components/menus/TopBar';
import Footer from '../../components/menus/Footer';
const useStyles = makeStyles((theme) => ({
root: {
marginTop: 60,
marginBottom: theme.spacing(4),
paddingTop: 60,
marginBottom: -64,
display: 'flex',
minHeight: '100vh',
flexDirection: 'column',
},
flex: {
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
},
gridItem: {
display: 'flex',
justifyContent: 'center',
},
spaceBetween: {
display: 'flex',
justifyContent: 'space-between',
},
wysiwyg: {
marginTop: theme.spacing(3),
marginBottom: theme.spacing(3),
space: {
height: 64,
},
content: {
textAlign: 'justify',
......@@ -42,11 +37,6 @@ const useStyles = makeStyles((theme) => ({
marginBottom: 0,
},
},
buttonGroup: {
display: 'flex',
justifyContent: 'space-between',
marginTop: '10px',
},
}));
function PublicArticleDetailsPage({
......@@ -104,8 +94,10 @@ function PublicArticleDetailsPage({
<div className={classes.content} dangerouslySetInnerHTML={{ __html: article.content }} />
</Grid>
</Grid>
<div className={classes.space} />
</Container>
</Fade>
<Footer />
</>
);
}
......
......@@ -19,10 +19,15 @@ import { useAppContext } from '../../contexts/context';
import ArticleDetails from '../../components/articles/ArticleDetails';
import { usePagination } from '../../utils/hooks';
import TopBar from '../../components/menus/TopBar';
import Footer from '../../components/menus/Footer';
const useStyles = makeStyles(() => ({
root: {
marginTop: 60,
paddingTop: 60,
marginBottom: -64,
display: 'flex',
minHeight: '100vh',
flexDirection: 'column',
},
flex: {
display: 'flex',
......@@ -37,6 +42,9 @@ const useStyles = makeStyles(() => ({
display: 'flex',
justifyContent: 'space-between',
},
space: {
height: 64,
},
pagination: {
display: 'flex',
justifyContent: 'flex-end',
......@@ -184,8 +192,10 @@ function PublicArticlePage({
)}
</Grid>
)}
<div className={classes.space} />
</Container>
</Fade>
<Footer />
</>
);
}
......
......@@ -24,11 +24,19 @@ import { usePagination } from '../../utils/hooks';
import Spinner from '../../components/system/Spinner';
import TopBar from '../../components/menus/TopBar';
import { useAppContext } from '../../contexts/context';
import Footer from '../../components/menus/Footer';
const useStyles = makeStyles((theme) => ({
root: {
flexGrow: 1,
marginTop: 60,
paddingTop: 60,
marginBottom: -64,
display: 'flex',
minHeight: '100vh',
flexDirection: 'column',
},
space: {
height: 64,
},
list: {
width: '100%',
......@@ -206,8 +214,10 @@ const PublishersPage = () => {
</Grid>
)}
</Grid>
{/* <div className={classes.space} /> */}
</Container>
</Fade>
<Footer />
</>
);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment