diff --git a/src/client/components/main_layout/Footer.js b/src/client/components/main_layout/Footer.js index ff2f826c1ba658def50b636c0e940e99c6c5e28f..722ce5f835e09d92b09a4f09b0a8bfe9f26a337b 100644 --- a/src/client/components/main_layout/Footer.js +++ b/src/client/components/main_layout/Footer.js @@ -1,54 +1,100 @@ import React from 'react'; import Paper from '@material-ui/core/Paper'; import PropTypes from 'prop-types'; +import Grid from '@material-ui/core/Grid'; import { withStyles } from '@material-ui/core/styles'; -import oxfordLogo from '../../img/logos/oxford-logo-white.png'; -import pennLogo from '../../img/logos/penn-logo2-white-small.png'; -import cnrsLogo from '../../img/logos/cnrs-logo-white-small.png'; -import aaltoLogo from '../../img/logos/aalto-logo-white-no-background-small.png'; +import oxfordLogo from '../../img/logos/partners/ox_brand6_pos_rect.gif'; +import oxfordLogo2 from '../../img/logos/partners/Long-Logo-RGB.jpg'; +import pennLogo from '../../img/logos/partners/PL SIMS Logo_small.png'; +import cnrsLogo from '../../img/logos/partners/logo_cnrs_irht2.jpg'; +import aaltoLogo from '../../img/logos/partners/Aalto_SCI_EN_13_BLACK_2_cropped.png'; +import secoLogo from '../../img/logos/partners/13_9_04_logo_cropped_small.png'; -const logoPadding = 50; -const logoHeight = 52; +//const logoPadding = 50; +const logoHeight = 50; const styles = theme => ({ root: { position: 'absolute', + + boxShadow: '0 -10px 10px -10px #333', //borderTop: '4px solid' + theme.palette.primary.main, - display: 'flex', - alignItems: 'center', - justifyContent: 'center', + //display: 'flex', + //alignItems: 'center', + //justifyContent: 'center', bottom: 0, width: '100%', height: 64, - background: theme.palette.primary.main, + //background: theme.palette.primary.main, borderRadius: 0, }, + layout: { + width: 'auto', + height: '100%', + marginLeft: theme.spacing.unit * 2, + marginRight: theme.spacing.unit * 2, + [theme.breakpoints.up(1500 + theme.spacing.unit * 3 * 2)]: { + width: 1500, + marginLeft: 'auto', + marginRight: 'auto', + }, + }, + logoContainer: { + display: 'flex', + alignItems: 'center', + justifyContent: 'center' + }, oxfordLogo: { //paddingLeft: 24, height: logoHeight }, + oxfordLogo2: { + //paddingLeft: logoPadding, + height: logoHeight + }, pennLogo: { - paddingLeft: logoPadding, - height: logoHeight - 6 + //paddingLeft: logoPadding, + height: logoHeight }, cnrsLogo: { - paddingLeft: logoPadding, + //paddingLeft: logoPadding, height: logoHeight }, aaltoLogo: { - paddingLeft: logoPadding, - height: logoHeight - 10 + //paddingLeft: logoPadding, + height: logoHeight - 8 + }, + secoLogo: { + //paddingLeft: logoPadding, + height: logoHeight }, }); const Footer = props => { const { classes } = props; return ( + <Paper className={classes.root}> - <img className={classes.oxfordLogo} src={oxfordLogo} alt='logo' /> - <img className={classes.pennLogo} src={pennLogo} alt='logo' /> - <img className={classes.cnrsLogo} src={cnrsLogo} alt='logo' /> - <img className={classes.aaltoLogo} src={aaltoLogo} alt='logo' /> + <Grid container spacing={0} className={classes.layout}> + <Grid item xs className={classes.logoContainer}> + <img className={classes.oxfordLogo} src={oxfordLogo} alt='logo' /> + </Grid> + <Grid item xs className={classes.logoContainer}> + <img className={classes.oxfordLogo2} src={oxfordLogo2} alt='logo' /> + </Grid> + <Grid item xs className={classes.logoContainer}> + <img className={classes.pennLogo} src={pennLogo} alt='logo' /> + </Grid> + <Grid item xs className={classes.logoContainer}> + <img className={classes.cnrsLogo} src={cnrsLogo} alt='logo' /> + </Grid> + <Grid item xs className={classes.logoContainer}> + <img className={classes.aaltoLogo} src={aaltoLogo} alt='logo' /> + </Grid> + <Grid item xs className={classes.logoContainer}> + <img className={classes.secoLogo} src={secoLogo} alt='logo' /> + </Grid> + </Grid> </Paper> ); }; diff --git a/src/client/img/logos/partners/13_9_04_logo_cropped_small.png b/src/client/img/logos/partners/13_9_04_logo_cropped_small.png new file mode 100644 index 0000000000000000000000000000000000000000..e0c30a4df5a1ba197b9b2fd138fc8a1d54517e5d Binary files /dev/null and b/src/client/img/logos/partners/13_9_04_logo_cropped_small.png differ diff --git a/src/client/img/logos/partners/Aalto_SCI_EN_13_BLACK_2_cropped.png b/src/client/img/logos/partners/Aalto_SCI_EN_13_BLACK_2_cropped.png new file mode 100644 index 0000000000000000000000000000000000000000..3f52b1ea8abb6808665ffd3d0cd11843e71cdd2c Binary files /dev/null and b/src/client/img/logos/partners/Aalto_SCI_EN_13_BLACK_2_cropped.png differ diff --git a/src/client/img/logos/partners/Long-Logo-RGB.jpg b/src/client/img/logos/partners/Long-Logo-RGB.jpg new file mode 100644 index 0000000000000000000000000000000000000000..aca39bd76cdb8982cf1d82d11681de3145a26cf3 Binary files /dev/null and b/src/client/img/logos/partners/Long-Logo-RGB.jpg differ diff --git a/src/client/img/logos/partners/PL SIMS Logo_small.png b/src/client/img/logos/partners/PL SIMS Logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..851acaf7822e3955df4082f2a43b97542f722d13 Binary files /dev/null and b/src/client/img/logos/partners/PL SIMS Logo_small.png differ diff --git a/src/client/img/logos/partners/logo_cnrs_irht2.jpg b/src/client/img/logos/partners/logo_cnrs_irht2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e06b18b7f3ebf23300b05d870ce00c928db08c81 Binary files /dev/null and b/src/client/img/logos/partners/logo_cnrs_irht2.jpg differ diff --git a/src/client/img/logos/partners/ox_brand6_pos_rect.gif b/src/client/img/logos/partners/ox_brand6_pos_rect.gif new file mode 100644 index 0000000000000000000000000000000000000000..b68a93b12bf34afeaaac73d6b85f150df57ae44a Binary files /dev/null and b/src/client/img/logos/partners/ox_brand6_pos_rect.gif differ