From: Tom Hughes <tom@compton.nu>
Date: Sat, 27 Apr 2024 14:15:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4724'
X-Git-Tag: live~580
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7154ebbb540fc8c93da45e58b6885b642737d605?hp=5a958d3d69d07c287496e590bfbebcbc2f7f90b5

Merge remote-tracking branch 'upstream/pull/4724'
---

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 1c1da3677..b23dea69a 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -94,8 +94,6 @@ OSM.Search = function (map) {
     }
 
     markers.addLayer(marker);
-
-    $(this).closest("li").addClass("selected");
   }
 
   function hideSearchResult() {
@@ -104,8 +102,6 @@ OSM.Search = function (map) {
     if (marker) {
       markers.removeLayer(marker);
     }
-
-    $(this).closest("li").removeClass("selected");
   }
 
   function panToSearchResult(data) {
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d4bc31255..ca9a820f9 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -545,10 +545,6 @@ header .search_forms,
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
-  ul li.selected {
-    background: $list-highlight;
-  }
-
   .search_more .loader {
     display: none;
   }
diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 97514d5ca..07549d69b 100644
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -10,7 +10,6 @@ $grey: #CCC;
 $darkgrey: #888;
 $headerHeight: 55px;
 $sidebarWidth: 350px;
-$list-highlight: #FFFFC0;
 
 $link-color: #24d;
 $link-hover-color: #24d;
diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb
index fc2138318..05d7d5d63 100644
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -7,7 +7,7 @@
 <% else %>
   <ul class='results-list list-group list-group-flush'>
     <% @results.each do |result| %>
-      <li class="list-group-item search_results_entry"><%= result_to_html(result) %></li>
+      <li class="list-group-item list-group-item-action search_results_entry"><%= result_to_html(result) %></li>
     <% end %>
   </ul>
   <% if @more_params %>