From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Apr 2024 17:18:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4717'
X-Git-Tag: live~158
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/02c60f78f6639c303e639865dbe279763e5060db?hp=7171dcd76c4999ae0c250742f55966cf34ca3bc0

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

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 59c3a8b49..313bd1cc0 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -216,7 +216,7 @@ OSM.Query = function (map) {
 
           if (interestingFeature(element)) {
             var $li = $("<li>")
-              .addClass("query-result list-group-item")
+              .addClass("query-result list-group-item list-group-item-action")
               .data("geometry", featureGeometry(element))
               .text(featurePrefix(element) + " ")
               .appendTo($ul);
@@ -230,14 +230,14 @@ OSM.Query = function (map) {
 
         if (results.remark) {
           $("<li>")
-            .addClass("query-result list-group-item")
+            .addClass("query-result list-group-item list-group-item-action")
             .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
             .appendTo($ul);
         }
 
         if ($ul.find("li").length === 0) {
           $("<li>")
-            .addClass("query-result list-group-item")
+            .addClass("query-result list-group-item list-group-item-action")
             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }
@@ -246,7 +246,7 @@ OSM.Query = function (map) {
         $section.find(".loader").hide();
 
         $("<li>")
-          .addClass("query-result list-group-item")
+          .addClass("query-result list-group-item list-group-item-action")
           .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
           .appendTo($ul);
       }
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cf616983e..d3399420b 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -640,10 +640,6 @@ tr.turn {
         &.query-result {
           cursor: pointer;
         }
-
-        &.selected {
-          background: $list-highlight;
-        }
       }
     }
   }
diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 719f5ad3b..c46174d78 100644
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -20,5 +20,6 @@ $link-decoration: none;
 $link-hover-decoration: underline;
 
 $table-border-factor: .1;
+$list-group-hover-bg: rgba(var(--bs-emphasis-color-rgb), .075);
 
 $enable-negative-margins: true;
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 5d612dd78..41529e0c2 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -5,7 +5,7 @@
         <div class="input-group flex-nowrap">
           <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm z-0", :dir => "auto" %>
           <div class="input-group-text border-start-0 p-0 position-relative">
-            <%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 me-1 btn btn-sm btn-outline-primary border-0 bg-transparent", :title => t("site.search.where_am_i_title") %>
+            <%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 me-1 btn btn-sm btn-outline-primary border-0 bg-transparent text-primary link-body-emphasis link-opacity-100-hover", :title => t("site.search.where_am_i_title") %>
           </div>
           <%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
         </div>