From 9d7178bd20cd09f194b85ba7f0786a6fe3147c67 Mon Sep 17 00:00:00 2001
From: Norbert Kwizera <norkans7@gmail.com>
Date: Mon, 29 Jan 2024 11:59:13 +0200
Subject: [PATCH] Fix configured colors load CSS classes

---
 templates/public_base.html | 112 +++++--------------------------------
 1 file changed, 15 insertions(+), 97 deletions(-)

diff --git a/templates/public_base.html b/templates/public_base.html
index fed49a386..09c594c1f 100644
--- a/templates/public_base.html
+++ b/templates/public_base.html
@@ -45,123 +45,57 @@
         <style type="text/css">
           .bg-dark1,
           .bg-dark1-v2024 {
-            background: {
-                {
-                org|config: 'dark1_color' |default:'#439932'
-              }
-            }
-
-            ;
+            background: {{ org|config: 'dark1_color' |default:'#439932' }};
           }
 
           .border-dark1,
           .border-dark1-v2024 {
-            border-color: {
-                {
-                org|config: 'dark1_color' |default:'#439932'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'dark1_color' |default:'#439932' }};
           }
 
           .hover\:border-dark1:hover,
           .hover\:border-dark1-v2024:hover {
-            border-color: {
-                {
-                org|config: 'dark1_color' |default:'#439932'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'dark1_color' |default:'#439932' }};
           }
 
           .bg-dark2,
           .bg-dark2-v2024 {
-            background: {
-                {
-                org|config: 'dark2_color' |default:'#1751af'
-              }
-            }
-
-            ;
+            background: {{ org|config: 'dark2_color' |default:'#1751af' }};
           }
 
           .border-dark2,
           .border-dark2-v2024 {
-            border-color: {
-                {
-                org|config: 'dark2_color' |default:'#1751af'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'dark2_color' |default:'#1751af' }};
           }
 
           .hover\:border-dark2:hover,
           .hover\:border-dark2-v2024:hover {
-            border-color: {
-                {
-                org|config: 'dark2_color' |default:'#1751af'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'dark2_color' |default:'#1751af' }};
           }
 
           .bg-dark3,
           .bg-dark3-v2024 {
-            background: {
-                {
-                org|config: 'dark3_color' |default:'#5eb3e0'
-              }
-            }
-
-            ;
+            background: {{ org|config: 'dark3_color' |default:'#5eb3e0' }};
           }
 
           .border-dark3,
           .border-dark3-v2024 {
-            border-color: {
-                {
-                org|config: 'dark3_color' |default:'#5eb3e0'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'dark3_color' |default:'#5eb3e0' }};
           }
 
           .hover\:border-dark3:hover,
           .hover\:border-dark3-v2024:hover {
-            border-color: {
-                {
-                org|config: 'dark3_color' |default:'#5eb3e0'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'dark3_color' |default:'#5eb3e0' }};
           }
 
           .border-light1,
           .border-light1-v2024 {
-            border-color: {
-                {
-                org|config: 'light1_color' |default:'#FFD100'
-              }
-            }
-
-            ;
+            border-color: {{ org|config: 'light1_color' |default:'#FFD100' }};
           }
 
           .bg-light1,
           .bg-light1-v2024 {
-            background: {
-                {
-                org|config: 'light1_color' |default:'#FFD100'
-              }
-            }
-
-            ;
+            background: {{ org|config: 'light1_color' |default:'#FFD100' }};
           }
 
           .bg-light1.hover-dark:hover,
@@ -171,24 +105,12 @@
 
           .text-light1,
           .text-light1-v2024 {
-            color: {
-                {
-                org|config: 'light1_color' |default:'#FFD100'
-              }
-            }
-
-            ;
+            color: {{ org|config: 'light1_color' |default:'#FFD100' }};
           }
 
           .bg-light2,
           .bg-light2-v2024 {
-            background: {
-                {
-                org|config: 'light2_color' |default:'#5eb3e0'
-              }
-            }
-
-            ;
+            background: {{ org|config: 'light2_color' |default:'#5eb3e0' }};
           }
 
           .bg-light2.hover-dark:hover,
@@ -240,9 +162,7 @@
             display: block;
           }
 
-            {
-            % if org|config: "has_new_brand" %
-          }
+        {% if org|config: "has_new_brand" %}
 
           .bg-dark1-v2024,
           .bg-dark2-v2024,
@@ -281,9 +201,7 @@
             color: #00aeef;
           }
 
-            {
-            % endif %
-          }
+        {% endif %}
         </style>
         <script type="text/javascript">
           var defaultColors = ["#e4002b", "#ff8200", "#ffd100", "#009a17", "#41b6e6", "#0050b5", "#d9d9d6"];