From 314c93536905718b534bd185694a9a767472cc24 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 7 Jan 2015 12:55:04 -0500 Subject: [PATCH 1/3] Remove edX branding from default Open edX LMS OPEN-307 --- lms/djangoapps/branding/__init__.py | 16 ++++++++++------ lms/envs/common.py | 3 ++- .../{header-logo.png => edx-header-logo.png} | Bin .../{logo-edX-77x36.png => edx-logo-77x36.png} | Bin lms/static/images/logo-placeholder-large.png | Bin 0 -> 20342 bytes lms/templates/courseware/courses.html | 11 ++++++++--- lms/templates/footer-edx-new.html | 2 +- lms/templates/main.html | 2 +- 8 files changed, 22 insertions(+), 12 deletions(-) rename lms/static/images/{header-logo.png => edx-header-logo.png} (100%) rename lms/static/images/{logo-edX-77x36.png => edx-logo-77x36.png} (100%) create mode 100644 lms/static/images/logo-placeholder-large.png diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py index afa590552d..a9d5742bb2 100644 --- a/lms/djangoapps/branding/__init__.py +++ b/lms/djangoapps/branding/__init__.py @@ -63,11 +63,15 @@ def get_logo_url(): # otherwise, use the legacy means to configure this university = microsite.get_value('university') - if university is None: - return '{static_url}images/logo-edX-77x36.png'.format( + if university is None and settings.FEATURES.get('IS_EDX_DOMAIN', False): + return '{static_url}images/edx-logo-77x36.png'.format( + static_url=settings.STATIC_URL + ) + elif university: + return '{static_url}images/{uni}-on-edx-logo.png'.format( + static_url=settings.STATIC_URL, uni=university + ) + else: + return '{static_url}images/logo-placeholder.png'.format( static_url=settings.STATIC_URL ) - - return '{static_url}images/{uni}-on-edx-logo.png'.format( - static_url=settings.STATIC_URL, uni=university - ) diff --git a/lms/envs/common.py b/lms/envs/common.py index e8da3006f8..e785c78f8b 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -186,7 +186,8 @@ FEATURES = { # Enable legacy instructor dashboard 'ENABLE_INSTRUCTOR_LEGACY_DASHBOARD': True, - # Is this an edX-owned domain? (used on instructor dashboard) + + # Is this an edX-owned domain? (used for edX specific messaging and images) 'IS_EDX_DOMAIN': False, # Toggle to enable certificates of courses on dashboard diff --git a/lms/static/images/header-logo.png b/lms/static/images/edx-header-logo.png similarity index 100% rename from lms/static/images/header-logo.png rename to lms/static/images/edx-header-logo.png diff --git a/lms/static/images/logo-edX-77x36.png b/lms/static/images/edx-logo-77x36.png similarity index 100% rename from lms/static/images/logo-edX-77x36.png rename to lms/static/images/edx-logo-77x36.png diff --git a/lms/static/images/logo-placeholder-large.png b/lms/static/images/logo-placeholder-large.png new file mode 100644 index 0000000000000000000000000000000000000000..f762f3bc9ea2306afd86ccab6f7dc149eb40c15d GIT binary patch literal 20342 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 literal 0 HcmV?d00001 diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 695ab9a5d3..5f8a0c80fe 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -17,12 +17,17 @@ else: course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore courses from {platform_name}.").format(platform_name=platform_name)) - # not sure why this is, but if I use static.url('images/edx-logo-bw.png') then the HTML rendering - # of this template goes wonky + + if settings.FEATURES.get('IS_EDX_DOMAIN', False): + # For some reason, `static.url('images/edx-logo-bw.png')` breaks template rendering. + default_image_url = settings.STATIC_URL + 'images/edx-logo-bw.png' + else: + default_image_url = settings.STATIC_URL + 'images/logo-placeholder-large.png' logo_file = microsite.get_value( - 'course_index_overlay_logo_file', settings.STATIC_URL + 'images/edx-logo-bw.png' + 'course_index_overlay_logo_file', default_image_url ) + logo_alt_text = _("{platform_name} Logo").format(platform_name=platform_name) %> diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html index ee2189542f..ade89a574d 100644 --- a/lms/templates/footer-edx-new.html +++ b/lms/templates/footer-edx-new.html @@ -11,7 +11,7 @@

${_("About edX")}

diff --git a/lms/templates/main.html b/lms/templates/main.html index b39a2494b7..eb355d33c4 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -153,7 +153,7 @@ <% if theme_enabled() and not is_microsite(): footer_file = 'theme-footer.html' - elif settings.FEATURES['IS_EDX_DOMAIN'] and not is_microsite(): + elif settings.FEATURES.get('IS_EDX_DOMAIN', False) and not is_microsite(): footer_file = microsite.get_template_path('footer-edx-new.html') else: footer_file = microsite.get_template_path('footer.html') From 6f5134f711d78ae19c69615b2b75b030bba0ab30 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 7 Jan 2015 17:17:13 -0500 Subject: [PATCH 2/3] Move edx branding into edx-theme directory OPEN-307 --- .../templates/static_templates/about.html | 2 +- lms/djangoapps/branding/__init__.py | 2 +- lms/static/images/edx-logo-large-bw.png | Bin 5668 -> 0 bytes .../edx-background-banner-account.png | Bin .../{ => edx-theme}/edx-edge-logo-large.png | Bin .../images/{ => edx-theme}/edx-header-logo.png | Bin .../images/{ => edx-theme}/edx-logo-77x36.png | Bin .../images/{ => edx-theme}/edx-logo-bw.png | Bin lms/static/sass/base/_variables.scss | 6 +++--- lms/static/sass/multicourse/_edge.scss | 2 +- lms/templates/courseware/courses.html | 4 ++-- lms/templates/footer-edx-new.html | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 lms/static/images/edx-logo-large-bw.png rename lms/static/images/{ => edx-theme}/edx-background-banner-account.png (100%) rename lms/static/images/{ => edx-theme}/edx-edge-logo-large.png (100%) rename lms/static/images/{ => edx-theme}/edx-header-logo.png (100%) rename lms/static/images/{ => edx-theme}/edx-logo-77x36.png (100%) rename lms/static/images/{ => edx-theme}/edx-logo-bw.png (100%) diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/about.html b/common/test/test_microsites/test_microsite/templates/static_templates/about.html index a326281b6d..53148823ae 100644 --- a/common/test/test_microsites/test_microsite/templates/static_templates/about.html +++ b/common/test/test_microsites/test_microsite/templates/static_templates/about.html @@ -17,7 +17,7 @@
##
## ##

“${_('The mission of {edX} is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.').format(edX="edX")}”

##
diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py index a9d5742bb2..23735823bf 100644 --- a/lms/djangoapps/branding/__init__.py +++ b/lms/djangoapps/branding/__init__.py @@ -64,7 +64,7 @@ def get_logo_url(): university = microsite.get_value('university') if university is None and settings.FEATURES.get('IS_EDX_DOMAIN', False): - return '{static_url}images/edx-logo-77x36.png'.format( + return '{static_url}images/edx-theme/edx-logo-77x36.png'.format( static_url=settings.STATIC_URL ) elif university: diff --git a/lms/static/images/edx-logo-large-bw.png b/lms/static/images/edx-logo-large-bw.png deleted file mode 100644 index d888e1f4bb9138cf0cd92096a144e2f7ac88738f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5668 zcmV+<7Tf8GP)ybxL#Ty-bsa<3M1gzZ zy%9j%=L@;s^#fPHE#TTET;&*WO*jFxmTlX4XkRqALR9$Bwy_3Qn+tgXw}3mk#dUpQ zPervhHjrJGa4c|vn+$(ITmsJz?^`VHe+}F}fBwvEadBG^w_~}MC<9*}Wwk~MaWQSKbS${Q`a^he z#2BB0UKel+xRZg4TtR+d$9z4htBl=VQviGjIH8SQz%AhN!M$i1B%^f4AoSw zGX6Y#?*YhZ@k<-GfIDGu3MUnCgHdw@r$Qp&Aqg0qe&5m^RKQgcW^8fY))ou9nWm6i zjNl(LI7N*j$F|=Q*rhwDfO~$6tG2n_C&-l^GdP8xExz6E+lQ=iag__WvqqJDRuoxW zWSvKKl|h#fx68)14(SdmZQKIx?77Mz0V)oxV-^{pXm(f;L43+%ag__WvqY7-77M2} zVrv)$uDHIX2E_p2;2fugMt#Pm$e@55-Nv;;t=G7$k8hD|`=@Y~xovEhcmU%cw~~NS zz)hsAPYazhi0%49A-N&3KdO)(70fFg2&sz*PPV(ORJw!yL*TYVb*JF|`0?ZT=FJ=V zWsz%B>X_7n2M^qZ^cYeqyxn5@1-sKGln5{`po5BVx9WZ_trle|iyE@#7^0s)e;)7N zy^Gqo{1ia*+UAVVu7Rbb2HTMP+$_pc7B0A<`u_d<@%HW8sE{6|F`~fCAXJ?J+LgLD zx9EWD8gCb6DN7uuJ**p!Pi5RM%2JkTz{Pt0{JE`-80jrf%0Vhf?*)_1Wu1S;{gGxL6V@*k;AYkjs3S%EgrKYhacaX9SIQ zaaooxU%o7b)*=C5Bi60ZUg;ool#H$rj4onq}K zfVLx6=pc}NFz+q{thE4bE7VIEPXU#3?bEN#V`|+inCnDgSt?*!p{>yVM8gRP{mFiL zUaPKKrfP9dT+R*vO3h>TUAr04MQ%VHun$IRnrAOwFSCVJs1q74!Y9`NVB?sU`Ce-O zpzc?n8PrB)DIG?Fq*pMn(*sw#od%>h=)(oO8Ufl$Xb9-1 zDX`8CSY`EWR*@>Zn{0~eN)O7F9vxr_kAz6Oyt8X3VNAi|Dlpbm7?oJoSt+KhuQT3n z-1&l}HrYU{f=q+q(i#vsfp(n-Tx8?5@4P{I0?Uzr?Pi4(1H9sa8y}={z_9^ecrLg$ zz}k>@EvT>M{IIyr@3H_^MRt3R8yjeiIpCsp^dMA6v|roVfaJr~&S`N$#Fk<~5wyNz zYi_&N;~EjFJ&zhjoNtDIrUV!PmkT-hAJ^w7v{zYaMJ#TD?$pW^k7(_ZJ7N za8iQ{+(Cl^+qDOR#pgf@o+V8yTM6|Bth4|Wr|n9yxLj9UOZN}g1S`8s%F1F5LJa^n z`dLuXx{lt`r~P0?ruPJEyCW3&17P7ZRyp*=4hEPQHgGOE(Bu?&CghrL9nebl%$A7H+7Fu?fve6INZwChM(tVnB_ zin@8h#S?8Y1|_FPqif53E8;YtF>?uZsYBZl02<5vl|q(wD(HKmrRw52ULtjqf{WqZ z0hg2FqB^fpF8S)j(k_J#z)~Y9(aeGS#{QG-!bcu~qD+UL6-w!L4ydNqh)T97r( zQSG$g;>3rDX+0?I(Eeh(7Fb+PH4{h#N!ik3>*a!m5+tIm!FBK%;QKv({P=kF>eb`@ z`}dDlc=J~`SwAj@w-Oq{BDi?J(pI%=edoLOQJ+KA)+XGh^#pcM5D5dycY7)Dfrz%- zLQ80`T)Fa(?%lih7v3U=0+JwV3N(yJG_aJsiKvOdH>pRDeGnPjoUA7dc0Bypjn~`H zo;{PW8hZ5T(O6wO1zdCDEy|?N+;l`<8<{_i$TsPITGi#FA+QUS;YA0hT*s+ZM5H$M z>({R(q)xqj`EsJZ+5CZz$Qj;2VDWw`#MG`Qbp0;rLIIh=NU73M^1(x~c7xDP6(_94 zy0T zs#RA`PjIbgb-_m*iGmLyjs_#psmJTo`)hk*1Q)x)Cd7LQ*yQ!V%3}b5HTlnQSy!*y z{OQxD*shp5wwzD_f5^t-VtBVq;K(V7N-^n{ZSv`i1gpv(wL&NH&tC-LbLDT|ys3d? z09@B~D6p#uiufA|@HyMrBM#iQcYwp&=C_Z1=XI%<=Pj*cLSfg}Ymt=&U!AkPZhNj5 zFJ2g6G9;(qU=_E|G*jP@KDano1*{@H0EMk9%8l-GDAQ{R5m|1#cbCG@sWO0dF(7sA z+BFKGF1Y2SSClsFd|rmGV(RBDE5zW2WL5>t^5;93Q>b9%J*Nzld0lW~Xw4v1llbSZas^k<1PB#c91p-vv}_Lq zoj8NGRT+SLJdrHdi*}b~{jTgv%iy!O8MbkkMjkV-j1Pco_S@zH?lu5io7>!F@Wril zv=mrfn76Ep4n&k1cpGW8@2ALDo(ftC5-E`ayUd(KjV=c_xd$b0sB8~f+teeh4<9~^ z3QYa|dt?G`lcdGP^VY`n;f53%G)X62fG!~NytLU_8!g#BnUK2pO zVb{u<`$Hnk=?`wM3f8HEu=)0FGWfDCeP28Yp>l(HZCm|Ami*sg%5kDchIY*!@exBF z5{*tXSS4#$vBkv^Ic1o||mm^N+OD-Vs^I+KJ*vK5~iX=ybwB9EpaI2ZY#la{%f(0eu#O)5E0-R2;iaTWou|4bq zm}gUfH+P(KLYt>X6N&C z#9STIWB@)muZJIYZ6962I--z_Y56&U+vEV39{?7^$9skO89|1wlGUU!TqZNh&_Iq| z_c9JF?dTE!Cx%%hJQuTj=)E4n<-o0(7_2$Ai+^VFnwL}8;BqFeedaA*Q}bptI);IC z2i6F70e9?6YmVUBr}gpBI&1G^5#Z43z-xd;hT*5vNx%h~69LErjy=W9FSwGHXermh=i>*6;riYDrZRvJz+xx^9DxmO*<%2>^txBZm5lw} z7DsSlQG7Q5skZbEnY>j`lXVg7h~kHWwNvy^1~FL*Is`5|jb3XKYtA*cZWUp@&O`Sw zw{TFG99-OnrX@6OEI8w-?Q615q)sxq&C@hYCu6ggA=K#HRp_Q^l0 z@4d7$g0@HsE{4{5+1LB4ZE9W+?QgVG4Vd)F;@gIM0S(85eUP?>fa4f49|jT$xyn4K zxPX55TFuYQRmNUt;6YwS5D=m~W~FJePPAwhVN)W%XYxT93=LpX0o=;D{Puqd&m#%H z>-~A>_-GrRj~zSs8WEpcypc{9(qpPmDLEF{egxCmFz9&J^5bHgK^w7eS$k(L&RdZ?ca2FcYwgta8tf#qm&F1mDfL!=a@@ zCUQm{drtj@c1_HC~wb`?EDwsR~K(IGmXQukGb;4Da-pa(} z0@Pco`K9J^cjz8wZ|W|drv4iW#!gmDkgh?6reO_K(!hGbjvorJ> z0hdqAm>ybtXU8xcyevxr7n_y94253V+>f}DNNXX$DkGd(Wp`3_UB-X4M$V%R6)nFp!KBL#?ep`qz`8A( znLMnyJf+1Fr)~1Z5!z{hi=1m+94f-a?;9`06cY(YoNA&q0ieX%7Hi)k6R-;+++*@C z2WM0yglARb_&Jz-0Etb55GE@@n+YwUJkiAOQx^)ab0D~qqvh(6{04!Y= zy;RJQu>1S_e~u{ZRTdLltF4d;T?O;@gjm1I>(_~6(eif?0JF>O?d_QM0nVt&;5}9J zyV|$i4&!-uDn}Ir5kReIUDE}~P7?rIdZ~%_uW>Uu90mdoDU%3@O@P^LNhSLMsAhS4 zdsBgTad83mLvY7pxdLvpD`GnL>_1K9Jx160`W-vph-n9_jcu#IJ(1>T18{1AWz14l)41}%lQkXzL|&P>#{IYDdm0lSS@V=YCXTB) z&XTk3m~~8N01Bx{+C%kqRaJ4Z}l+cg_ z+(GS+9cd6mq9$2uPCL#7#lRqNnSo!LDkNqg7}LE{5;F$7I))GVQRCV*F8Y9@*CYdX z07L*A)pm!;X-4OFbn*fK5J3o_2ZarW&=d=IfOm3edGD}Y;|2|hwWu9jLx;z-;2NeV z04O2cG{9kv%g1+(X0R4!%H%ii>$xViFCHZJ`1rVy*yRs2jRo3bLQ^>s<+#h7 z8W&&J?w~@DB7j|@RyVPL-}S)-Ktq7@=T)Y3w&Gbgl*JvYdEG<}1%RoXagEEack_UY z;be;b0jwBi-c+{tW7e9|*7>@O_T1;3l|Z|bq162VP1|}o831=u=M+D;#}2N9lzOhm zhN@WavSom`OOjG3sgdNMX#gyQoj0HP6iqjh58Tck+VIG1DvS0;;4;8Ok}8f%wviPv zRYDn)I9$pa-kQ*YXutM6+Ajx28+TqxqRw?rp5uBOTBLCUc3-PU~9fa{x2S^?Bc=Qs(lUHxc0Sg|L$>#>v8ct zM76uo7S{D@j_JK_5Y)RYKg3>2FKaI?h_f=9wUu*D3oF)i0Xnx0&JNh^*8V!Yb}6v^ z`9Y7*&(EWfGR*^<)B>{$@HIg@H@nY80`x9aE){={k0ZFhK>h;|_r|C?8Yuq&0000< KMNUMnLSTZHsq9Ap diff --git a/lms/static/images/edx-background-banner-account.png b/lms/static/images/edx-theme/edx-background-banner-account.png similarity index 100% rename from lms/static/images/edx-background-banner-account.png rename to lms/static/images/edx-theme/edx-background-banner-account.png diff --git a/lms/static/images/edx-edge-logo-large.png b/lms/static/images/edx-theme/edx-edge-logo-large.png similarity index 100% rename from lms/static/images/edx-edge-logo-large.png rename to lms/static/images/edx-theme/edx-edge-logo-large.png diff --git a/lms/static/images/edx-header-logo.png b/lms/static/images/edx-theme/edx-header-logo.png similarity index 100% rename from lms/static/images/edx-header-logo.png rename to lms/static/images/edx-theme/edx-header-logo.png diff --git a/lms/static/images/edx-logo-77x36.png b/lms/static/images/edx-theme/edx-logo-77x36.png similarity index 100% rename from lms/static/images/edx-logo-77x36.png rename to lms/static/images/edx-theme/edx-logo-77x36.png diff --git a/lms/static/images/edx-logo-bw.png b/lms/static/images/edx-theme/edx-logo-bw.png similarity index 100% rename from lms/static/images/edx-logo-bw.png rename to lms/static/images/edx-theme/edx-logo-bw.png diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 5de045cf37..025591b4e6 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -411,9 +411,9 @@ $homepage__header--background: lighten($gray, 15%); // IMAGES: backgrounds $homepage-bg-image: none; -$login-banner-image: url(../images/edx-background-banner-account.png); -$register-banner-image: url(../images/edx-background-banner-account.png); -$passwordreset-banner-image: url(../images/edx-background-banner-account.png); +$login-banner-image: url(../images/edx-theme/edx-background-banner-account.png); +$register-banner-image: url(../images/edx-theme/edx-background-banner-account.png); +$passwordreset-banner-image: url(../images/edx-theme/edx-background-banner-account.png); $video-thumb-url: '../images/homepage-hero-video-thumb.jpg'; diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss index 150a2738f3..996825c7fd 100644 --- a/lms/static/sass/multicourse/_edge.scss +++ b/lms/static/sass/multicourse/_edge.scss @@ -175,7 +175,7 @@ $paleYellow: #fffcf1; width: 263px; height: 72px; margin: 150px auto 50px; - background: url(../images/edx-edge-logo-large.png) no-repeat; + background: url(../images/edx-theme/edx-edge-logo-large.png) no-repeat; text-indent: -9999px; overflow: hidden; } diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 5f8a0c80fe..700e27e561 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -19,8 +19,8 @@ course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore courses from {platform_name}.").format(platform_name=platform_name)) if settings.FEATURES.get('IS_EDX_DOMAIN', False): - # For some reason, `static.url('images/edx-logo-bw.png')` breaks template rendering. - default_image_url = settings.STATIC_URL + 'images/edx-logo-bw.png' + # For some reason, `static.url('images/edx-theme/edx-logo-bw.png')` breaks template rendering. + default_image_url = settings.STATIC_URL + 'images/edx-theme/edx-logo-bw.png' else: default_image_url = settings.STATIC_URL + 'images/logo-placeholder-large.png' diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html index ade89a574d..40ca1b8055 100644 --- a/lms/templates/footer-edx-new.html +++ b/lms/templates/footer-edx-new.html @@ -11,7 +11,7 @@

${_("About edX")}

From cae70d996627ac8842eac0a95606b70c6f642709 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Thu, 8 Jan 2015 16:15:27 -0500 Subject: [PATCH 3/3] Move default Open edX branding into default-theme directory OPEN-307 --- lms/djangoapps/branding/__init__.py | 2 +- .../logo-large.png} | Bin lms/static/images/default-theme/logo.png | Bin 0 -> 4243 bytes lms/templates/courseware/courses.html | 2 +- lms/templates/footer.html | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename lms/static/images/{logo-placeholder-large.png => default-theme/logo-large.png} (100%) create mode 100644 lms/static/images/default-theme/logo.png diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py index 23735823bf..6e723c2ee6 100644 --- a/lms/djangoapps/branding/__init__.py +++ b/lms/djangoapps/branding/__init__.py @@ -72,6 +72,6 @@ def get_logo_url(): static_url=settings.STATIC_URL, uni=university ) else: - return '{static_url}images/logo-placeholder.png'.format( + return '{static_url}images/default-theme/logo.png'.format( static_url=settings.STATIC_URL ) diff --git a/lms/static/images/logo-placeholder-large.png b/lms/static/images/default-theme/logo-large.png similarity index 100% rename from lms/static/images/logo-placeholder-large.png rename to lms/static/images/default-theme/logo-large.png diff --git a/lms/static/images/default-theme/logo.png b/lms/static/images/default-theme/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..94099e36507aaa769236d86c65682c934b00c390 GIT binary patch literal 4243 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 ## this is just a placeholder logo - ## feel free to change this logo to your own - organization logo placeholder + ## feel free to change this logo to your own by replacing "logo.png" with your own logo + organization logo placeholder