From 7f01e804730ddebf8738845081c83449eae699fe Mon Sep 17 00:00:00 2001
From: Norbert Kwizera <norkans7@gmail.com>
Date: Fri, 12 Jan 2024 14:19:42 +0200
Subject: [PATCH] Fix primary color for new brand

---
 templates/frame.html       | 18 ------------------
 templates/public_base.html |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/templates/frame.html b/templates/frame.html
index e833e685b..8067e8fad 100644
--- a/templates/frame.html
+++ b/templates/frame.html
@@ -38,24 +38,6 @@
           href="{{ STATIC_URL }}css/jqcloud.css">
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
           rel="stylesheet">
-    <style type="text/css">
-    <!-- color overloads for countries -->
-    .primary-border {
-       border-color: {{ org|config:"dark1_color"}} !important;
-    }
-    
-    .primary-background {
-       background: {{ org|config:"dark1_color"}} !important;
-    }
-    
-    .highlight-background {
-       background: #FFD100;
-    }
-    
-    .highlight-color {
-       color: #FFD100;
-    }
-    </style>
     <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
     {% block styles %}
         {% if is_rtl_org %}
diff --git a/templates/public_base.html b/templates/public_base.html
index bff0f5ef2..ecccaa5b9 100644
--- a/templates/public_base.html
+++ b/templates/public_base.html
@@ -964,7 +964,7 @@
 {% block script %}
     <script type="text/javascript">
       // global primary color
-      var primaryColor = '{{ org|config:"dark1_color"}}';
+      var primaryColor = '{% if org|config:"has_new_brand" %}#00aeef{% else %}{{ org|config:"dark1_color" }}{% endif %}';
       window.string_Responders = "{% trans "Responders" %}";
       window.string_Polled = "{% trans "Polled" %}";
       window.string_Reporters = "{% trans "Reporters" %}";