diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js index 5eabe7e9edea9efd535de805d401785a91f5473b..305ab435bcc0b02f4d346dfab1585a47f334fd86 100644 --- a/src/client/containers/MapApp.js +++ b/src/client/containers/MapApp.js @@ -12,11 +12,6 @@ import TopBar from '../components/TopBar'; import CircularProgress from '@material-ui/core/CircularProgress'; import purple from '@material-ui/core/colors/purple'; -import { - getVisibleResults, - getVisibleValues -} from '../selectors'; - import { updateQuery, toggleDataset, @@ -40,6 +35,9 @@ import { removeTempMarker } from '../actions'; +const logoPadding = 50; +const logoHeight = 52; + const styles = theme => ({ root: { flexGrow: 1, @@ -118,25 +116,29 @@ const styles = theme => ({ background: theme.palette.primary.main, borderRadius: 0, }, - aaltoLogo: { + oxfordLogo: { //paddingLeft: 24, - height: 37 + height: logoHeight + }, + pennLogo: { + paddingLeft: logoPadding, + height: logoHeight - 8 + }, + aaltoLogo: { + paddingLeft: logoPadding, + height: logoHeight - 8 }, uhLogo: { - paddingLeft: 44, - height: 52 + paddingLeft: logoPadding, + height: logoHeight }, secoLogo: { - paddingLeft: 44, - height: 52 + paddingLeft: logoPadding, + height: logoHeight - 5 }, heldigLogo: { - paddingLeft: 44, - height: 37 - }, - kotusLogo: { - paddingLeft: 44, - height: 50 + paddingLeft: logoPadding, + height: logoHeight - 10 }, }); @@ -261,17 +263,19 @@ let MapApp = (props) => { } </div> <Paper className={classes.footer}> - + <img className={classes.oxfordLogo} src='img/logos/oxford-logo-white.png' alt='Oxford University logo'/> + <img className={classes.pennLogo} src='img/logos/penn-logo-white.png' alt='Oxford University logo'/> + <img className={classes.aaltoLogo} src='img/logos/aalto-logo-white-no-background-small.png' alt='Aalto University logo'/> + <img className={classes.uhLogo} src='img/logos/university-of-helsinki-logo-white-no-background-small.png' alt='University of Helsinki logo'/> + <img className={classes.secoLogo} src='img/logos/seco-logo-white-no-background-small.png' alt='SeCo logo'/> + <img className={classes.heldigLogo} src='img/logos/heldig-logo-small.png' alt='HELDIG logo'/> </Paper> </div> </div> ); }; -// <img className={classes.aaltoLogo} src='img/logos/aalto-logo-white-no-background-small.png' alt='Aalto University logo'/> -// <img className={classes.uhLogo} src='img/logos/university-of-helsinki-logo-white-no-background-small.png' alt='University of Helsinki logo'/> -// <img className={classes.secoLogo} src='img/logos/seco-logo-white-no-background-small.png' alt='SeCo logo'/> -// <img className={classes.heldigLogo} src='img/logos/heldig-logo-small.png' alt='HELDIG logo'/> + const mapStateToProps = (state) => { return { @@ -279,8 +283,7 @@ const mapStateToProps = (state) => { browser: state.browser, search: state.search, map: state.map, - manuscripts: getVisibleResults(state.search), - manuscriptsPropertyValues: getVisibleValues(state.search), + manuscripts:state.search.manuscripts, creationPlaces: state.search.places, place: state.search.place, facet: state.facet, diff --git a/src/client/img/logos/oxford-logo-white.png b/src/client/img/logos/oxford-logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..41a3baaa42a52b489f6e15a77063de81d2e17a8c Binary files /dev/null and b/src/client/img/logos/oxford-logo-white.png differ diff --git a/src/client/img/logos/penn-logo-white.png b/src/client/img/logos/penn-logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..9e533bbfec81d325cdaf0a9fac7bbaca0dfd9c21 Binary files /dev/null and b/src/client/img/logos/penn-logo-white.png differ