From cc99327618f47e3ff4b3d8cca986a66cb5977445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Wed, 24 Jan 2024 14:19:44 +0100
Subject: [PATCH] Adjust CMAP styling for themes

---
 lib/vue/src/components/map/CMap.vue           | 35 ++++++++++++-------
 .../variables/18182031_webapp_variable.scss   |  2 --
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/lib/vue/src/components/map/CMap.vue b/lib/vue/src/components/map/CMap.vue
index bdb1c3db9..5d1596d58 100644
--- a/lib/vue/src/components/map/CMap.vue
+++ b/lib/vue/src/components/map/CMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <div 
+  <div
     class="position-relative"
   >
     <div
@@ -47,14 +47,14 @@
         url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
         :attribution="mapOptions.attribution"
       />
-    
+
       <l-polygon
         v-for="(geometry, i) in polygons"
         :key="`polygon-${i}`"
         :lat-lngs="geometry.map(value => value.geometry)"
         :color="geometry[0].color"
       />
-    
+
       <l-marker
         v-for="(marker, i) in markerValues"
         :key="`marker-${i}`"
@@ -76,7 +76,7 @@
           />
         </l-tooltip>
       </l-marker>
-    
+
       <l-control class="leaflet-bar">
         <a
           v-if="!hideCurrentLocationButton"
@@ -119,17 +119,17 @@ export default {
       type: Boolean,
       default: false
     },
-    
+
     labels: {
       type: Object,
       default: () => ({})
     },
-    
+
     map: {
       type: Object,
       default: () => ({})
     },
-    
+
     markers: {
       type: Array,
       default: () => ([])
@@ -150,7 +150,7 @@ export default {
       default: false
     }
   },
-  
+
   data () {
     return {
       geoSearch: {
@@ -300,17 +300,26 @@ export default {
 }
 
 .leaflet-bar a {
-  background-color: var(--primary);
-  color: var(--white);
+  background-color: var(--white) !important;
+  color: var(--primary) !important;
+  text-decoration: none !important;
 
   &:hover {
-    background-color: var(--primary-dark);
+    background-color: var(--white) !important;
     transition: background-color 0.15s ease;
   }
 }
 
-[data-color-mode="dark"] .leaflet-bar a {
-  color: var(--black);
+.geosearch-result {
+  &:hover {
+    background-color: var(--light) !important;
+    color: var(--black);
+  }
+
+  &:active {
+    color: var(--white) !important;
+    background-color: var(--primary) !important;
+  }
 }
 </style>
 
diff --git a/server/assets/src/scss/variables/18182031_webapp_variable.scss b/server/assets/src/scss/variables/18182031_webapp_variable.scss
index 8b36f9f37..d39dc8017 100644
--- a/server/assets/src/scss/variables/18182031_webapp_variable.scss
+++ b/server/assets/src/scss/variables/18182031_webapp_variable.scss
@@ -38,8 +38,6 @@ $gray-700: if(lightness($black) < lightness($white), mix($black, $white, 70%), m
 $gray-800: if(lightness($black) < lightness($white), mix($black, $white, 80%), mix($white, $black, 80%));
 $gray-900: if(lightness($black) < lightness($white), mix($black, $white, 90%), mix($white, $black, 90%));
 
-$primary-dark:   darken($primary, 7.5%) !default;
-
 $yiq-contrasted-threshold: 45; // Our magic number, we can pretend its 42..
 $yiq-text-dark:             $black !default;
 $yiq-text-light:            $white !default;