fix conflicts

rapidpro · Jan 11, 2024 · 14eca93 · 14eca93
1 parent 9c56128
commit 14eca93
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/templates/public/ureporters.html b/templates/public/ureporters.html
@@ -146,7 +146,11 @@
                                  class="md:flex engagement-graph-block hover-parent block mt-16 p-2 bg-dark-blue"
                                  id="graph-block-{{ metric.slug }}-{{ time_filter.time_filter_number }}">
                                 <div class="md:w-2/5 hover-parent">
+<<<<<<< HEAD
                                     <div class="bg-light1-v2024 h-1 w-16 mb-4"></div>
+=======
+                                    <div class="bg-light1-home h-1 w-16 mb-4"></div>
+>>>>>>> 8396dbd6 (fix conflicts)
                                     <div class="text-3xl mb-4 font-bold">{{ metric.title }}</div>
                                     <div data-page="engagement" class="text-xs flex mb-6 text-black random-pill">
                                         {% for segment in data_segments %}

diff --git a/templates/public_base.html b/templates/public_base.html
@@ -154,14 +154,19 @@
         display: block;
       }
       {% if org|config:"has_new_brand" %}
+<<<<<<< HEAD
       .bg-dark1-v2024, .bg-dark2-v2024,  .bg-dark3-v2024, .bg-light1-v2024, .bg-light2-v2024 {
+=======
+      .bg-dark1-home, .bg-dark2-home,  .bg-dark3-home, .bg-light1-home, .bg-light2-home {
+>>>>>>> 8396dbd6 (fix conflicts)
         background: #00aeef;
       }
 
       .bg-dark1-home.hover-dark:hover, .bg-dark2-home.hover-dark:hover,  .bg-dark3-home.hover-dark:hover, .bg-light1-home.hover-dark:hover, .bg-light2-home.hover-dark:hover {
         background: #42ccff;
       }
 
+<<<<<<< HEAD
       .border-dark1-v2024, .border-dark2-v2024, .border-dark3-v2024, .border-light1-v2024 {
         border-color: #00aeef;
       }
@@ -171,6 +176,9 @@
       }
 
       .text-light1-v2024 {
+=======
+      .text-light1-home {
+>>>>>>> 8396dbd6 (fix conflicts)
         color: #00aeef;
       }
 
@@ -272,7 +280,11 @@
             </div>
             <div class="md:w-1/4 rtl:float-left rtl:text-left ltr:float-right ltr:text-right   inline-block mb-4">
                 <a href="#"
+<<<<<<< HEAD
                    class="btn bg-light1-v2024 text-black inline-block download-screenshot hover-dark">Download</a>
+=======
+                   class="btn bg-light1-home text-black inline-block download-screenshot hover-dark">Download</a>
+>>>>>>> 8396dbd6 (fix conflicts)
             </div>
             <div class="mt-4 shadow">
                 <img src="#" alt="" class="screenshot-rendered">
@@ -787,7 +799,11 @@
                         {% endif %}
                     </div>
                     <a href="{% url 'public.ureporters' %}"
+<<<<<<< HEAD
                        class="btn bg-light2-v2024 text-white inline-block hover-dark">{% trans "EXPLORE ENGAGEMENT" %}</a>
+=======
+                       class="btn bg-light2-home text-white inline-block hover-dark">{% trans "EXPLORE ENGAGEMENT" %}</a>
+>>>>>>> 8396dbd6 (fix conflicts)
                 </div>
             </div>
         </div>