Adjust favicon

rapidpro · Jan 11, 2024 · 88d6734 · 88d6734
1 parent e78e4bf
commit 88d6734
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/static/base.html b/static/base.html
@@ -14,7 +14,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
-  <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}img/favicon.ico">
+  <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}img/favicon-v2024.png">
 
   <!-- CSS: implied media="all" -->
   {# load compress #}

diff --git a/templates/frame.html b/templates/frame.html
@@ -20,7 +20,11 @@
 <![endif]-->
     <!-- Mobile viewport optimized: j.mp/bplateviewport -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    {% if org.subdomain %}
+    {% if org|config:"has_new_brand" %}
+        <link rel="icon"
+              type="image/x-icon"
+              href="{{ STATIC_URL }}img/favicon-v2024.png">
+    {% elif org.subdomain %}
         <link rel="icon"
               type="image/x-icon"
               href="{{ STATIC_URL }}img/favicos/flag_{{ org.subdomain }}.png">

diff --git a/templates/public/index.html b/templates/public/index.html
@@ -42,7 +42,7 @@
         </div>
     {% endif %}
     <!-- ureporters graph -->
-    <div class="bg-black text-light1-v2024 bg-white-u">
+    <div class="bg-black text-light1-v2024 {% if not org|config:"has_new_brand" %} bg-white-u{% endif %}">
         <div class="md:flex max-w-page mx-auto p-home">
             <div class="md:w-1/2 md:mt-0 md:p-0 flex-center-y mt-4 p-8">
                 <div class="font-bold text-l">
@@ -262,13 +262,13 @@
             <div class="flex">
                 <div class="flex-1 h-10"></div>
                 <div class="flex-1 bg-dark1-v2024">
-                    <div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 bg-dark2-v2024 h-10">&nbsp;</div>
+                    <div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10  {% if org|config:"has_new_brand" %} bg-black {% else %}bg-dark2-v2024{% endif %} h-10">&nbsp;</div>
                 </div>
             </div>
             <div>
                 {% for story in main_stories|slice:"1" %}
                     <div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid border-dark1-v2024">
-                        <div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid border-light1-v2024 flex">
+                        <div class="{% if is_rtl_org %}border-l-25rem{% else %}border-r-25rem{% endif %} border-solid {% if org|config:"has_new_brand" %} border-black {% else %}border-light1-v2024{% endif %} flex">
                             <div class="w-1/3 rtl:pr-10 ltr:pl-10 pl-10 flex flex-col justify-center">
                                 <div class="block">
                                     <div class="font-bold mb-4">{% trans "FEATURED STORY" %}</div>
@@ -301,7 +301,7 @@
             <div class="flex">
                 <div class="flex-1 h-10"></div>
                 <div class="flex-1 bg-dark1-v2024">
-                    <div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 bg-dark2-v2024 h-10"></div>
+                    <div class="rtl:mr-20 rtl:ml-10 ltr:ml-20 ltr:mr-10 {% if org|config:"has_new_brand" %} bg-black {% else %}bg-dark2-v2024{% endif %} h-10"></div>
                 </div>
             </div>
             <div class="flex">

diff --git a/templates/public/org_chooser.html b/templates/public/org_chooser.html
@@ -16,7 +16,7 @@
     <!-- Mobile viewport optimized: j.mp/bplateviewport -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Place favicon.ico & apple-touch-icon.png in the root of your domain and delete these references -->
-    <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}img/favicon.png">
+    <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}img/favicon-v2024.png">
     <style type="text/css">
     body {
       background-image: url('/sitestatic/img/landing_bg.jpg');

diff --git a/templates/public_base.html b/templates/public_base.html
@@ -18,7 +18,11 @@
         <meta name="keywords" content="">
         <meta name="author" content="">
         {% if has_better_domain %}<meta name="robots" content="noindex">{% endif %}
-        {% if org.subdomain %}
+        {% if org|config:"has_new_brand" %}
+        <link rel="icon"
+              type="image/x-icon"
+              href="{{ STATIC_URL }}img/favicon-v2024.png">
+        {% elif org.subdomain %}
             <link rel="icon"
                   type="image/x-icon"
                   href="{{ STATIC_URL }}img/favicos/flag_{{ org.subdomain }}.png">
@@ -766,7 +770,9 @@
         <div class="md:flex max-w-page mx-auto text-white p-home">
             <div class="md:w-1/3 md:block hidden">
                 <div class="w-40">
+                    {% if not org|config:"has_new_brand" %}
                     <img src="{{ STATIC_URL }}img/blue_u.png">
+                    {% endif %}
                 </div>
             </div>
             <div class="md:w-2/3 {% if is_rtl_org %}md:text-left{% else %}md:text-right{% endif %} text-center">