From a37406126eab4da778602ddad925f55586a99251 Mon Sep 17 00:00:00 2001 From: Angela Gilhotra Date: Mon, 30 Nov 2020 17:28:53 +0530 Subject: [PATCH 1/4] quest_of_the_day return 0 if length is 0 * Returns an IndexError otherwise --- app/marketing/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/marketing/views.py b/app/marketing/views.py index 32bd22edf3b..4c03026a5f4 100644 --- a/app/marketing/views.py +++ b/app/marketing/views.py @@ -968,7 +968,7 @@ def trending_avatar(): return avatar.first() def quest_of_the_day(): - quest = trending_quests()[0] + quest = trending_quests()[0] if (len(trending_quests())) else 0 return quest def upcoming_grant(): From f0dd7efe6dd34b4c18e5132d9bd90854913ad1b8 Mon Sep 17 00:00:00 2001 From: Angela Gilhotra Date: Mon, 30 Nov 2020 17:46:48 +0530 Subject: [PATCH 2/4] fix: remove
* the buttons need to be placed sideways --- app/retail/templates/emails/grants/new_grant.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/retail/templates/emails/grants/new_grant.html b/app/retail/templates/emails/grants/new_grant.html index 1a84395759f..295f210c5dc 100644 --- a/app/retail/templates/emails/grants/new_grant.html +++ b/app/retail/templates/emails/grants/new_grant.html @@ -99,7 +99,6 @@

{{ grant.title }}

{% trans "View Your Grant" %} -
{% trans "Learn How to Maximize your Matching" %} From 679c0a63ba9471da87b62ff56466f1f336a470c4 Mon Sep 17 00:00:00 2001 From: Angela Gilhotra Date: Mon, 30 Nov 2020 18:27:19 +0530 Subject: [PATCH 3/4] Minor ui fix --- app/retail/templates/emails/new_bounty_acceptance.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/retail/templates/emails/new_bounty_acceptance.html b/app/retail/templates/emails/new_bounty_acceptance.html index bf75a769967..5b358fabd60 100644 --- a/app/retail/templates/emails/new_bounty_acceptance.html +++ b/app/retail/templates/emails/new_bounty_acceptance.html @@ -34,7 +34,7 @@

🌈 {% trans "Funds Paid!" %} 🌈

{% if bounty.title %} -

+

{{ bounty.title }}

{% endif %} From 4a192cc3b7ad4f365e3df4f0c40b4339cefb1374 Mon Sep 17 00:00:00 2001 From: Angela Gilhotra Date: Mon, 30 Nov 2020 22:30:32 +0530 Subject: [PATCH 4/4] Replace Slack icon to Discord invite in emails' footer --- app/assets/v2/images/social/discord.png | Bin 0 -> 1871 bytes app/retail/templates/emails/template.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 app/assets/v2/images/social/discord.png diff --git a/app/assets/v2/images/social/discord.png b/app/assets/v2/images/social/discord.png new file mode 100644 index 0000000000000000000000000000000000000000..82d75bfe0635fb0e57b482df18ab2f45d6af6a7d GIT binary patch literal 1871 zcmV-V2e9~wP)6edS5;ScQ>Welr>CbWx(w&@`Tj&A@rmy7 zxwUZBk)?El>+|#T1zpq0WHQ^?*?FX@j5<{%P~*|?iMqPFX-ciCGGr;GiJb4fy}jG2 z3W$^l^gQ+WG*$S|2pS)RETuG&yx7yzlT{HR5+VwszkuFXZ;SP)2&ssOOeWLX)YSA1 z5}@7}6%*o2#L3AC#{Yj+90In;Qe76hy1F)$1FVUtAt?yLN-mdM92gk5v3baf2g~$AkpH>#%|n7eOQuAfdj#ey@h~fe2LJ8%iS*hs;Ps zfz?dhNMK0G2pt-%6XHq&K)Rxp6#JHGm;@35>kuQIU;;XH3vCL@5J&_}q>6xqtE($@ zaB$#VZE<^h>pe@osUkpsV`JmDpdZWX2zv2nI7`X_Xz%$ZG5YG-Fh zt*xyU%NZIPQr+F%PGvD@m`s+NxRns$>MNkqo12>+0bJ?X*;(((Ko5f`q`SMj5-DkG zYg5h5&8nrP#cMFG0P?M_uD+5i%Oe316r9wBK3rYx#QO0|c z0I>39Y;0_JN?C}{d{ZQXq~SNolMsIwpWv;4p$Q!&0fiO67Vq%~K^7%6mrzi(4%Qha z!2L#$8TTF$Bn=ai2iZ%kb+Fl%0FicFnF#T)hzq1dP~7k@(`QMH~`Mw z;o+euFRTaYi$qG284gTbNC2QTEr#(hh!~dSjDv3QLpqebrAWGdl4O>eq*{VSol{9A zFq@WQRs>I*;quyOasXp|e0<#V9N{3LQMN;qoh{S+0}In2!Wf3z-``iZn4h07&O#X= zVrFK>I3Gd9;jicoKzVTMr9OiGPQlEy6+SCWVqon2`vV$Wk={ ziL-@7$%2S%rG@B_NKaUqrfI!PL|YIl$byK_RbyKsOs3W}aWh#3m)WnN4L3%KxW2wt zw%}l{9~i4)iWIO5gz>Tf zo`-V8GjOO7eR6@|o!KP$*+(=D56t1JC^^dQ3XE%8QyB!4)gaGu4?`mzmdQkfixz)t znA$)@TqF?1C8-Ehm=YU|o|CR8L=6lk&5wsx$ z4b#^$OfTi3!pr&~hu1%C0R022!E2vLC==2rt&d^BCrehX12;Mm*f|@xf53(efY&JX z-asQj2*(NVSyyCeI0)p`aD83@LecxuWkpy*O!*C#r?~8w)W4(@NCYqO2RTcApyGZd zh6cJSHhqoLg!cA!&nYv#3%hms-f0oozcgPC&@Bk2Ljeq03k00G_hzyIrCN%7@#J@+&aaucQGe zAp$$k8X6kTVtwhxa@I;vJtAnuCssC2LnyFSAvc) z1cvHzx!i&>#42Kj^T)@>#h@QU_hQHBSb_;<^@0xLru4Y(%x4e*Kj`wS>FkCvirv@O zcl7l1G!iyduT_8qs{5$q0E=i{17y%;K*dXEoP&fy-HrIDN0~At4Zm0AC=-B!$(lei zYSpynVIrxHqdk^KADxdo7IyGQa+DzoKp#;0!}Z9tl|<+u#&PHrO4K>b7ZE%uczAgD zrIK^waXu2AS1%`k|9UMUQ;JjQ>k%z2*+dmqX#m^hAZEpL|*t*U^k5upR#X<-}VaL7N>K%=ut`$rno@c-#P9c9l4;U{0#5E|cYX0ZSO002ov JPDHLkV1jgQSSSDh literal 0 HcmV?d00001 diff --git a/app/retail/templates/emails/template.html b/app/retail/templates/emails/template.html index a8d1229f577..22a6623e54d 100644 --- a/app/retail/templates/emails/template.html +++ b/app/retail/templates/emails/template.html @@ -928,7 +928,7 @@ - + {% endblock %}