From ac79d8814d61e4f28fe5325ccc9be0bee0320f73 Mon Sep 17 00:00:00 2001
From: Esko Ikkala <esko.ikkala@aalto.fi>
Date: Fri, 12 Oct 2018 15:22:18 +0300
Subject: [PATCH] Update logos
---
src/client/containers/MapApp.js | 34 +++++++++++-------
.../img/logos/cnrs-logo-white-small.png | Bin 0 -> 2088 bytes
2 files changed, 21 insertions(+), 13 deletions(-)
create mode 100644 src/client/img/logos/cnrs-logo-white-small.png
diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js
index 305ab435..883394b7 100644
--- a/src/client/containers/MapApp.js
+++ b/src/client/containers/MapApp.js
@@ -124,22 +124,26 @@ const styles = theme => ({
paddingLeft: logoPadding,
height: logoHeight - 8
},
- aaltoLogo: {
- paddingLeft: logoPadding,
- height: logoHeight - 8
- },
- uhLogo: {
+ cnrsLogo: {
paddingLeft: logoPadding,
height: logoHeight
},
- secoLogo: {
- paddingLeft: logoPadding,
- height: logoHeight - 5
- },
- heldigLogo: {
+ aaltoLogo: {
paddingLeft: logoPadding,
height: logoHeight - 10
},
+ // uhLogo: {
+ // paddingLeft: logoPadding,
+ // height: logoHeight
+ // },
+ // secoLogo: {
+ // paddingLeft: logoPadding,
+ // height: logoHeight - 5
+ // },
+ // heldigLogo: {
+ // paddingLeft: logoPadding,
+ // height: logoHeight - 10
+ // },
});
let MapApp = (props) => {
@@ -265,10 +269,10 @@ let MapApp = (props) => {
<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.cnrsLogo} src='img/logos/cnrs-logo-white-small.png' alt='CNRS 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>
@@ -276,6 +280,10 @@ let MapApp = (props) => {
};
+//<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'/>
+// <img className={classes.uhLogo} src='img/logos/university-of-helsinki-logo-white-no-background-small.png' alt='University of Helsinki logo'/>
+
const mapStateToProps = (state) => {
return {
diff --git a/src/client/img/logos/cnrs-logo-white-small.png b/src/client/img/logos/cnrs-logo-white-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..76e5de65362efaa329e214f6c64d3626101aead2
GIT binary patch
literal 2088
zcmV+@2-o+CP)<h;3K|Lk000e1NJLTq002P%002M;1^@s6MXMU%00004XF*Lt006O%
z3;baP00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-*v3=9u9p#k@l000NKNkl<Z
zc-rlodyHLG6~=$-wlmXq94H_U<&{1Fg_M?BD^}B(;HzqlwUGjr6oEp06=Q5n2}U$Z
zDB3o}N7brW!ygmDHbIFrTA{JhDi*~;r?dkt9T-~rfSFp_&g=7!v#!}3&N=t?&Yk<1
z_$4<vkG0R)`#Wpzz1Fw)HHHY1MgdL0C}12g9ykkVc9Z`A2Y}tc9^e?z1Dr6kekuqn
zbHf{e$-q=#CU7M%p~&Jd0Z##2fG2@x&8)p{NRTuVSO9#+NjPVakL&|>0nY#r0j*}%
zORYlE$0hBQ)T5!n2}%1UeM?ePtu_8_l76SkqDRtFNoPs2YBoM6=>|!MR6TS^x=qsg
z)goYxq+Znq{v~N)#Rf)6rvRIPNwqdC0e=DJn%Tip9*`@NfD3`gYmk8ahnxw#BI$Zb
zBg#&K6Yv}0GHM$J{2KU`q;X~I4&DVG_28$TuoGBpX6wsA!asp2)F)mCZZor=m)spB
z-CxH90E_{CC~1C4BuKgim`DAi3HYg`Str#UB#j6D0i4G0K^HK?%(fRx!Y1H-HQ10I
zpm7l8_W%=<()3)6fa@~|=yMO53yd)b@OI#9{*n+60*ioe0ByiMz__5?bYQJFE{~(Y
z65v{34X_pXh!<%BMgYs*_7JcPxF~q$XfM0XgQyS}0xJrNAd)&$!qe9!EiF*~G)e1%
zGMD)ECP`;!l)E;_LtYB5k4v%tzNC#Fzhu>CO+q{NNt&8fXtAWego6E&R>W+tl(a<B
z=feg{YLT?n%UvE9TqG@$^gT%nV)wr4`ABC%y{1W8Ch2ZTcX+;Vad7`VPRuH=PqSbD
zSjq=o;o{GmUeqM%k12&ZCA~GUT_$P3E8Qb$kEC}8_dn_7CI{EfmDJ{C`u(>xR)@Wk
zUXERx@9)Z&>67%`;QnmC)*smYP0~E~-XwHOIx~rcD?B|-!m7Y-Zi>yi;0sKY)Fo+(
zpIhLX1Cow<WhH5K@a*N14g}|?C%or~q&b02TZ!4{!lZ$5B5+<xPgxTjuS~JI3OK`$
zUjbeSW}b6_eAhS*d>zPt@lOZO*yaNt3HQRm`ABd+vBa6;i*F#ov#xih1`=jlob^c=
zM701nNxBiZ)y38P=-d!YZT-MTpgVZ~Xg?lEi1^}Y0LBLA8%iW$vZT{PPiO!xN-=&u
zIG&m??S!};_z7^AHz3V+WZ)$#pcBN=47@8iUkE%=A`u@7Nf?o#4u^C91qB{D(g__o
z#6i>5k}h*E?J%?H9veJGw3bmUW`rc<fKxKU%{)$}%<B{-Vmz=~(u|<Xwwl=#BFX=O
zgszo@N%4WPA;qva)*mY^lBD6iz*<SG!<fO$9s%Zi@}~mNzaUOR+QLS2EI+SSqmytp
za1*di(ppIqoQNJXdk~map#0d7gn^8{6b2Osi(t1Jl3F7$2WXdcucR?f#(Ln9Vo1;V
zv~?)O@RHzoR{;{X1Aq7VzFJreEb*lQ1J-5O_J$*Re-OOHajK-TX7-xT?;{FSpv{A(
z-%_NKJp`Bmw3u0!q&*pS2SQKi1NLSZ&vy6f0{)O<vm4lHW}WU;xhjkiBm`Yq`or%3
zkzi&5Ix>uJ432N{oIj3MpfeapCKNeMmD1SX`+%6X(6Yh3z=&4J)9`fI9rE#hcS^i4
zP103nw!zF^l=MMhDbdD@6GW2yJ%M5~yNGD8R5JDhOU!JCq-~yuOm;D4pA(c%_(nTf
zY1kYmVZZm0Bof{N+$Cw2nH@H>Et0Mw+I7-rW}y%=&6T85zOWTR%2?n7zz#EeLeh0U
z-!}qXVO@ax{6nST&+#~6pL;_ZrUQ>jI?u<4V`lb3jDSxOtqC^9`eq@IP)Y)&6!rLC
zNsEG*pxw;2=j-BI1~vj$XS}n`%#Oan6U^+@xS){|W_Czg>jUIouhhlBHNdo({Q^l3
zy9U{u^2`Qcrlc<KMx!L%Otf|9@{}@-z$!^!0q*yl;W%(U@L_L!AunuAlh^J{k=IJW
zK+5$aF5t9Pc}f4$G`0D!8R2s|r?+Y+VVmQ#VJ;?6^f3JKfSDahB*DxEfc3+ifQ}?J
zDjwOb9L59)c+AZHok@b3Z3dnlrX&ow^hY620QmMWCE;ggwxd`Q9tNHpW&|7tzMOV5
ziG*(8N5hPS&t+{Ie-jCwRki{<h6w@pWk>+2o`9LX4E(?amwHA!@SQ@N!&Ai%Gy8Fv
zZq^}=153^9`9g+;6rg#b3{_{i!&PSnMS{y^^Xrg+JI!o)vBt${fqw$NS;h(ubprJZ
zqOC!cjRemr?j~Elt`$5)w3GE%SxLw%IKU0TRHGX7hF=2n%<QCB%8Hi8&8!=^j%Zh!
z)tCp|4t&APj+avSq?Xam>^0wrF+jG4S1BAL+P}PdFb_HDMG_YzKI@TKPYK<ih3u8A
zVzCSO#9#>+e1b0Bnz7+43B8gwW$Y{~21g~WlypYzC>7GBzBFD5JnH)vbJQXv&5?9)
zh#KE6>7#WMs!95iq$edE9_0TYU-U0Occ|-ZLqtRa(Vw&44_pDfgJ?-CYn8auv%c*_
z|CN5+%$}*lhqDTJMhnq@Ct8TsI?o|m-^>wh0XhJ@O0-+18#r9)f6f0Nz<&Wc)bam0
SHUUKd0000<MNUMnLSTa3tImf2
literal 0
HcmV?d00001
--
GitLab