From 7eda0d39dcf736d1dd3ae2e7415ec796ecb3acf8 Mon Sep 17 00:00:00 2001 From: Anna Gavrilman Date: Wed, 6 Mar 2024 07:54:52 -0500 Subject: [PATCH] Updating logos and favicon (#5369) --- cms/templates/cms/program_page.html | 2 +- static/images/favicon.ico | Bin 14846 -> 5558 bytes static/images/logo-micromasters.png | Bin 2379 -> 0 bytes static/images/logo-micromasters@2x.png | Bin 5155 -> 0 bytes static/images/logo-mitxonline.png | Bin 2253 -> 0 bytes static/images/micromasters_logo.svg | 1 - static/images/micromasters_logo_black.svg | 34 ++++++ static/images/micromasters_logo_on.svg | 1 - .../images/micromasters_logo_on_programs.svg | 12 --- static/images/micromasters_logo_programs.svg | 12 --- static/images/micromasters_logo_white.svg | 101 ++++++++++++++++++ static/images/mitxonline_logo.png | Bin 0 -> 3868 bytes static/images/open_learning_logo.svg | 56 ++++++++++ static/js/components/Navbar.js | 29 +++-- static/js/components/Navbar_test.js | 2 - static/js/containers/LearnerPage_test.js | 4 +- static/scss/certificate.scss | 4 +- static/scss/homepage.scss | 18 +--- static/scss/navbar.scss | 2 +- ui/templates/background-images.css | 11 +- ui/templates/certificate.html | 2 +- ui/templates/footer.html | 2 +- ui/templates/header.html | 10 +- ui/templates/mitx-online-required.html | 4 +- ui/templates/signin.html | 2 +- 25 files changed, 222 insertions(+), 87 deletions(-) delete mode 100644 static/images/logo-micromasters.png delete mode 100644 static/images/logo-micromasters@2x.png delete mode 100644 static/images/logo-mitxonline.png delete mode 100644 static/images/micromasters_logo.svg create mode 100644 static/images/micromasters_logo_black.svg delete mode 100644 static/images/micromasters_logo_on.svg delete mode 100644 static/images/micromasters_logo_on_programs.svg delete mode 100644 static/images/micromasters_logo_programs.svg create mode 100755 static/images/micromasters_logo_white.svg create mode 100644 static/images/mitxonline_logo.png create mode 100755 static/images/open_learning_logo.svg diff --git a/cms/templates/cms/program_page.html b/cms/templates/cms/program_page.html index c938e6d746..118ccb3f55 100644 --- a/cms/templates/cms/program_page.html +++ b/cms/templates/cms/program_page.html @@ -152,7 +152,7 @@

{% if page.program.has_mitxonline_courses %} {% else %} diff --git a/static/images/favicon.ico b/static/images/favicon.ico index 67203a5c9540190523f485de03bd9f39ff845dc7..95d530203dbecc0aa6df3f1b07f009fe720b4268 100644 GIT binary patch literal 5558 zcmeHK?M=im3^j-Wt{e0hx-l4sX;_g1vBzPjad8~SNu5gkIZHWzzW3Y+MFQXnp5bx< z^eeo-0K5Xgx^DS(0rB(x6I&e}0M-ZXj&s)O!7Yqcvv{mIuO>Ot++CR7U$i7A zbIjm(KCQty?IKO@#<`y1{DF7x53gtYTjl#AFYipo+{+kr$%=WNAy0-ATabS#&nJQN z57$P$#Bw}?We)N!9yxPLOz+H!=M4|NN6F~nnYY$AaD85(W?=54zGgaB`Nr|1ntJ|r zOmd&rJhS;uJP^!kweSPd)A!xd=DN27&m>?Xkxb?MePk z`cF^ww8Xv_&1sWZuP5hvvBwkb^)zKas^Q@ze=qiUqP?D`>_;^`oaFDt9#6E_)0F+F zhKG~6Bp!^0^p(k3h37S27MXpgzGN0;os^=XM}hv+wYIH8k1T>N~A zUfRXuiT1L_kIPaq3t5uV@GvbzxSHEF%R-68Z Uo3-c;v$__(w~K{&)EYPN3*C}%3IG5A literal 14846 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 diff --git a/static/images/logo-micromasters@2x.png b/static/images/logo-micromasters@2x.png deleted file mode 100644 index b7b7f78f353573aa2b88c5ffe35a718e8dde9cfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5155 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 HK#cnj=(-$m diff --git a/static/images/logo-mitxonline.png b/static/images/logo-mitxonline.png deleted file mode 100644 index 9fca13054bf453e90891be9d52fdb75df6c64170..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2253 zcmV;;2r~DHP)EX>4Tx04R}tkv&MmKpe$iTct%R1??arn4vmZ5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=H{g6A|?JWDYS_3;J6>}?mh0_0scmXsb<$WplX(p zP9}tGZdC}rB7|W?&<8rd-(Wz7w1{t=l&eMO5S9EPavLUx?vG-5KnJf zI_G`jC@V<{@j3CBK^G)`h+~SXQNBOx zvch?bvs$UK);;+P!+C9Gnd>x%ki;UEAVPqQ8p^1^LY!8O6ccIMPk8tT9luB}nOtQs zax9<<6_Voz|AXJ%nuW;;Hz}L|x?gPjV+0890?oQ@e;?a+^8^Sy16NwxUu^(0pQP8@ zTI>jjYy%h9ZB5<-E_Z-|CtWfmM+(sN7Ye}p8GTa@=)VPe*4*A&`#607GSpS-1~@nb zMvIia?(yzWXK(+WY4!I5aL96|m2D$>00006VoOIv00000008+zyMF)x010qNS#tmY z4c7nw4c7reD4Tcy000McNliru

`S5-{f`E87472Fgi9K~#9!?VM?B6;%|+e~$+U z#Dz5lO9}!S51+?w+!#xx3yUa|td9Sbb{E|uM%-mVu``>f!Ikyj#`jF69p!m^D zUxA{iuoOjwr6?*aMNw2(ijv7RFUT1flG#e+O+0aMiD#|K889wEY;B-QY2)mSW6s$Yea&;sZSbOz$UY2XNONrjb0>^fC-JbALP z7+BH>-}y7Z`_8syzzYHG-vwTDwoL_=1KoiVYx`HgNMHewUyFOX3bcyw8E*mJ0-gZc zIr}aHn}Hd?i3qMW9{9wvX94qMy&EtaXb-FazSK~#X)!9`vxv#Q#zYoS2)yJYDuC8N zE^rvQJH_|18JHsP@C%@i3ae?+1-RE|`(Plukv+@DK#v-Fwa+8=ls0XFeok~Yv`L17 zZ!cIdE@U87G%G*9*fR^V2X~FdD~1F$Kil%JO?kz|R~yk6ax}2VXIowP4*1s*?j*}T z0&KPHiin%w0Nxa@<%MdKB@~XD3&2sJw>K;Y_BBai#S#S1{YzBk z*<-3$ykbb$T)~c&9XdmCStAqHjEID_)e+7hM_31eS5xo|V;p-qFx|2b1AhZconw}z z=$$?S%mF$9?*TtGNntf{dIEP@AAUdJ_D1#$!yJ35Pn!>bg;oeSRE8u~0q5)l^b)W8 z2T&y5uO<`&6KdG@26^8-w&E z10MqCfS)DFu}wt0%*XkR0gj1~w#ZUs-LncSLpW-!KNhflG=_xxhM1 znZu>4-1Ar!R%WotTJI-ePY($T{o160UBG(hK1PYa>_kLL3*eg!>*DfR?>gd>I zHSB=W+1a^taO^cAsB@D1u!*U#GDBE9F!dcTJoi4AOTgD@6jpa90pW3H4UaE&diuTr zW3fJtAW#0!KGO=VV>LX@wkD>yM$Qj>HrtxU)y{blOfzz&G9=)&g4BWi_K&w zjN3(U4J(syJ^3u)$AGql>ajAzW8s8@INQ?Uu||`eY1;=>TJ|DLW-N^Lj{Te*HwcsE zoQauvA9hTA!?s>P%Ye4^nS@*9*jd20z&F-Xh{Os(-(%&d)US&D&8wG!6E(tRf}1u`XiVO=1(80*(2 zRpgUABYiz)X2Bdx%G>i)vw;GV%L6WxfZgIb!nlB`mDP8m^lso!%s*55dC;*@jhisV z;tkg4k;Aog{B`lY((q%fDB9GOY#A?jRAOeJBfarQ*1oowe_#yb6fgjIhwIbOU{dR= zF-7PoCdHNm4`S+pE^9EeO3p>}t~LP=;XhT&^S~QGC*d{(D`cq+D`oNfAY(N+et$^2 zQsAbLW1p6#HeAHa!J97Qnp>rpFT>1k2&!A1Qg{3GeEJaaaDT<=PQWO=Iq9}?-LSKQR9!pVFSc;;;QWQmnr6?*aMNwfXilV|& bl$7uvr8s~uD(l~$00000NkvXXu0mjf^fMMJ diff --git a/static/images/micromasters_logo.svg b/static/images/micromasters_logo.svg deleted file mode 100644 index f90c8277eb..0000000000 --- a/static/images/micromasters_logo.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 2 \ No newline at end of file diff --git a/static/images/micromasters_logo_black.svg b/static/images/micromasters_logo_black.svg new file mode 100644 index 0000000000..48be4e376e --- /dev/null +++ b/static/images/micromasters_logo_black.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/micromasters_logo_on.svg b/static/images/micromasters_logo_on.svg deleted file mode 100644 index 796cb37798..0000000000 --- a/static/images/micromasters_logo_on.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 1 \ No newline at end of file diff --git a/static/images/micromasters_logo_on_programs.svg b/static/images/micromasters_logo_on_programs.svg deleted file mode 100644 index fa21cc265f..0000000000 --- a/static/images/micromasters_logo_on_programs.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - MITx MicroMasters Programs - diff --git a/static/images/micromasters_logo_programs.svg b/static/images/micromasters_logo_programs.svg deleted file mode 100644 index 4724d0e141..0000000000 --- a/static/images/micromasters_logo_programs.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - MITx MicroMasters Programs - diff --git a/static/images/micromasters_logo_white.svg b/static/images/micromasters_logo_white.svg new file mode 100755 index 0000000000..9743b98b74 --- /dev/null +++ b/static/images/micromasters_logo_white.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/mitxonline_logo.png b/static/images/mitxonline_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0cab1b16394c445f06c7f571229e136aac0c4148 GIT binary patch literal 3868 zcmbtX`9Bog_n&EG4WWn3pfEF1C`)9YEM-QcETQa6mTXzF4`VB`#u&S%Y?W*oyDV9T z#xhKiy(}~K9uE=ILXimO~poA;< zKJZ_!;3%jETIn9@{au~7>_A3(n!!a}!n$D}*nR!pduKbHP5NOWH9umgX-{J>3@fCH=Somiam&uxpx1Iw4b)!KzeVB$3Uub$QTK0;wqNRPOD_J=KwJ>r zsx&#sDbCCF_<-ixz`9;f`h=B4$52bv{t)5O4!qIiqERb;*Yyn~4uPo+1x|N!$zoc;?fP?1DnolxxJ{v*Px;9d)zO zi8?MN-VG57&+;V360|%6{m}BDWBjVrP8$f&ye3>|mOWko#gvtAOE5RFfr#-<3(KW7 zSaPJSyG_wP>j1V{4@>9iPZdHo*SSyAV>d%t*#gEnk$$zA#Pk7kK}uwL>~!nn_ZAV7 z?nNJGJJ)0PrAw$VFO@RvEK&ZRS7C^tmQMQxjRlOtK~$pRunn*(0{uI7SD-nNZi%py zTM0&n zrH@+gk5DIg?4_MlV%k?#Ec7JinXXn35XuZDN37?rN=^-N5pq`L(v3c8kh#FdAXmIW z`H5dX?vwMsqCo?0i^qX_*NYHTF>S7_9Zf7!8MsREl^_}s)EI_5c1k~hH%oWo{PRtz z6-C+&AKtP#DVhjnjm_fj+B~`S+-$sPHBB2wH2O!Ro%fxxTAXqJznOg07c+h}*=Ot* zN&D{TrGcNMlLQj^tG`2!=|}H@-iE;05cQWiiXBW#mzRN@j zlK>b|^riQ@BnMG5vMC@$-wHb)1wrxTcCNjl8enM?n^Ob(wX_AC*0xg&zn4qZ z7*Mme#I6yNW$A6SEaLXO!Z^G$Lc2>tcGB0gHIda#3^WvQI54G-9(8hInu}6uBS4A% zhxsNl&*UM>Jn-Pbl2`!_#1k|cBxzDIE^z|9eMaO7tedmY-(_7{zz=bmhv1?~try5` z!i;2B{VmufhHfv1WoWBy$yq5Oinh|K=u2&3cxcD+Q znS;w*V(cZ(vTDP&5gFkz+J9=g4NV@bm@pg*e^3^i=L)u|yMT2WIw#K?!;mU9x^`NF zW}>rpJGyhk9gL_#x|D~IrCALp@j)It$^6!;8>Ifp-Gry`-9|lUK~=eZUp_!GS?V6@ zyNt;*Ah^VGEvI^xXSu{;5xe&=&KerP=DGhrM1c{Kw?77!**f@!>#^q*h0g*D$e`5sKfK|O`4YJOURmU-w+0rJ zJ*58&Kmr({IF<#Sxuoc3q?hN45SY595aW^K8WI9O8wYQ?Vpy5_DO8;xN+EN*DgP!b z#LQ|pqD!?0FA-|;1QP9;4B)jg|4JQpt?BH#O7B99+1S)Eo=z&s4?-^*tZ<=Kiz9PA zSe(+(RQ@fBvKQ|&_~?G|PU^SfblX}Efq5U6kk6;x!>Nn0HM~o?e(vFXqML=n*^Tt< z&*y{ev;giBJzrS~PD9}QWBTk=$(gfn{p-;Y@sOsxBFZ`~I*zP~g=g$@_gVqjh@jBc z8CnoH{N(@Va+XJfv22Xa<8Ic4oSxZ_>Z@7F+S?Yc1s)zvVt%tE-y`E?6Gh{ve!eL@ zolc{_dUy8l*=gcd8|yj=Dr{KVv{#HtxU7AVnsAzAUA7 zLOj#yIjGsGMDyf`iQGf0%quqaTng8jS0TY-rl)&C+Rgb_g77iywTmnwF~^UGF!iGV zCZ$v)N%jyd#G#s_ARnG2$LWw6E5pD2`+P>8x{c*~Od2)J?JbZ1$SoH64 z6Iv`BhO8P-eb|W>q0B)3+RgTa;$NqAN<;j;vTjIhb(TSAT(fvmg#nV;^|K#@J6?oHjXFNgbt-r9&kPr=U=*9)HGjh~Y~#U^EN z(cvIc5m#D*H&1y87$o(s>P1XLztVY|>!tU)u8w{4{~k1!AmV8D1}Y`YA&@g3(&=fz zP`z)(FYNehO5^i4c;-mz$7{|H_YJ+TXuo8}R!%sZB@z5$VFTuju~TWp{=0;4uAgXn z`@i|P9}Ouiq=%28zp86v0)m#Kd1m#p*c%B$>9)=*Z(TvfPvl*Py z@otAH_O)fD!3iA;o9TBn>ZPraUmI^`tgf6PsPl!1?uIk>_$+z9o zGh~!xTB5L8;_)|a_H=Ck_B1k|IWa^XKOvS%0)7QMxc)szaO^mhIROipM zsK;*)C|*6Q7ybl>4`*T0plxHS;J21Dd61G}YUqHFe$NeAX4`Y5sg*yZZLH6E8-b<0 zAJ9v?tLk+?2~&8CbNFtI-)iTkv|b|48<+Duvajh+^y26_^9<_dhH#3UgWW67i%k`? zuf?r$DWAgD<&&b43js+b-3Q++c&bfL43z&+{LC>!hmG&}ss{{Sl=XpF_FI1$au3f> zb$d3qk(ER171z1Mrj=VXGowc3HP_54f}nr7O9FDkXBxH{0WNc5G>Y3}=Oi!~0hc4Nz~U4bd{|zobi~g1raw8M19Z*^U$Y z;KF6*N3l*V&!y{@b7et~<$m)_#fQLQi$iy1WmMi>3$(X-BbgGF{bWWNrUmv90Up5z zmp^DcbSo%e`}wr`=Ruuw_AAvqH$~qjcVLQ%&Aavg{=0s=2LUJFm^Zs55z&ot_x%Ms!8x@Bz}%be`aoggnqzvDJkg}d#G z>TP&9=plv&Y&{^I95-vSIUT2r2cL$#~l zD`M(Bm56ky0t-&^pyYzVgW7t6Qa7&0y+AVBY@PJe@s=x(8(V-Z!9B>@z}cQ*@2A7s zOEc`;#XXAs=Bzbcjj!Q$fq7&cnS{UPB#A~VnmB&g_3>+9j$7N=@yD$u{6;14c8MP; z*@0qvHDdBTKv(C__QeEy`raon;lZHGa_c13SE3WBcd~&nVD4jSm`yjm;EwSQ&o7`o zzAGyB>dBTjc(WA51E*fWgA6Z?O{O7W+=^u;A2*|qh1yY5L; zc_x&S XT3(!6w!U;U?gEhdMtYSx_R;?bF!*$) literal 0 HcmV?d00001 diff --git a/static/images/open_learning_logo.svg b/static/images/open_learning_logo.svg new file mode 100755 index 0000000000..7c15f63bb6 --- /dev/null +++ b/static/images/open_learning_logo.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/static/js/components/Navbar.js b/static/js/components/Navbar.js index 97241903b9..6756945eb1 100644 --- a/static/js/components/Navbar.js +++ b/static/js/components/Navbar.js @@ -86,31 +86,28 @@ export default class Navbar extends React.Component { renderProfileHeader = () => [ MIT, - - MITx MicroMasters Programs - + /> ] renderAuthenticatedHeader = (link: string) => [ - MIT - , - - MITx MicroMasters Programs - + MicroMasters Programs + ] renderUnauthenticatedHeader = (link: string) => [ - MIT - , - - MITx MicroMasters Programs - + MicroMasters Programs + ] programSelector = (): React$Element<*> => { diff --git a/static/js/components/Navbar_test.js b/static/js/components/Navbar_test.js index cfa87224af..442fdc64e9 100644 --- a/static/js/components/Navbar_test.js +++ b/static/js/components/Navbar_test.js @@ -30,7 +30,6 @@ describe("Navbar", () => { "/dashboard", "/learner/jane", "/settings", - "/dashboard", "/dashboard" ]) }) @@ -48,7 +47,6 @@ describe("Navbar", () => { "/automaticemails", "/learner/jane", "/settings", - "/learners", "/learners" ]) } diff --git a/static/js/containers/LearnerPage_test.js b/static/js/containers/LearnerPage_test.js index cdb76e93b1..1fe4d48a4c 100644 --- a/static/js/containers/LearnerPage_test.js +++ b/static/js/containers/LearnerPage_test.js @@ -145,7 +145,7 @@ describe("LearnerPage", function() { return renderComponent(`/learner/${username}`, userActions).then( ([wrapper]) => { assert.equal( - 2, + 1, wrapper.find(".micromasters-nav").find("a[href='/dashboard']") .length ) @@ -1329,7 +1329,7 @@ describe("LearnerPage", function() { return renderComponent(`/learner/${username}`, anonymousUserActions).then( ([wrapper]) => { assert.equal( - 2, + 1, wrapper.find(".micromasters-nav").find("a[href='/']").length ) } diff --git a/static/scss/certificate.scss b/static/scss/certificate.scss index 966fc478fe..23821ab335 100644 --- a/static/scss/certificate.scss +++ b/static/scss/certificate.scss @@ -288,8 +288,8 @@ } .wrapper-accomplishment-orgs img { - max-width: 275px; - max-height: 100px; + width: 275px; + height: 100px; } .wrapper-accomplishment-orgs .wrapper-organization:first-child:nth-last-child(3), diff --git a/static/scss/homepage.scss b/static/scss/homepage.scss index 26d1931c1a..348a36905e 100644 --- a/static/scss/homepage.scss +++ b/static/scss/homepage.scss @@ -33,30 +33,18 @@ a { float: left; } - .brand-logo, - .micromasters-logo { + .brand-logo { float: left; /* background image from background-images.css */ background-repeat: no-repeat; - height: 36px; - width: 51px; overflow: visible; position: relative; - } - - .brand-logo { - height: 36px; - width: 51px; + height: 48px; + width: 250px; top: 2px; margin-right: 15px; } - .micromasters-logo { - height: 23px; - width: 263px; - top: 8px; - } - .divider-large { width: 1px; height: 32px; diff --git a/static/scss/navbar.scss b/static/scss/navbar.scss index dc666e6be0..1600885509 100644 --- a/static/scss/navbar.scss +++ b/static/scss/navbar.scss @@ -179,7 +179,7 @@ @include breakpoint(desktop) { img { - height: 27px; + height: 35px; margin-right: 25px; } } diff --git a/ui/templates/background-images.css b/ui/templates/background-images.css index 84240b9aae..01097e5f35 100644 --- a/ui/templates/background-images.css +++ b/ui/templates/background-images.css @@ -3,16 +3,7 @@ background-image: url({% static "images/homepage.jpg" %}); } .navbar .navbar-header .brand-logo { - background-image: url({% static "images/mit_logo.svg" %}); -} -.navbar .navbar-header .brand-logo:hover { - background-image: url({% static "images/mit_logo_on.svg" %}); -} -.navbar .navbar-header .micromasters-logo { - background-image: url({% static "images/micromasters_logo_programs.svg" %}); -} -.navbar .navbar-header .micromasters-logo:hover { - background-image: url({% static "images/micromasters_logo_on_programs.svg" %}); + background-image: url({% static "images/micromasters_logo_white.svg" %}); } .how-it-works-section .reasons-images-wrap::after { content: url({% static "images/hiw-arrow2.png" %}); diff --git a/ui/templates/certificate.html b/ui/templates/certificate.html index 09a00bdc97..bcd4c9e3ad 100644 --- a/ui/templates/certificate.html +++ b/ui/templates/certificate.html @@ -66,7 +66,7 @@

Supported by the following organiz
  • - MITx Logo + MicroMasters Logo
diff --git a/ui/templates/footer.html b/ui/templates/footer.html index 902ff9091d..d59831ffdd 100644 --- a/ui/templates/footer.html +++ b/ui/templates/footer.html @@ -4,7 +4,7 @@
- MIT + MIT {% if is_public %}
diff --git a/ui/templates/header.html b/ui/templates/header.html index 60570b478a..8d2f126b34 100644 --- a/ui/templates/header.html +++ b/ui/templates/header.html @@ -1,13 +1,9 @@