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

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 59c3a8b495c29638e57cd25ca677b064009f9b98..313bd1cc00618506e7e0e6e76143577f381f3d75 100644 (file)
--- 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 cf616983e29f708b68bbf32f8ed90980d578974d..d3399420b7652c2a04b686c4b7cff1f92aa67873 100644 (file)
--- 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 719f5ad3b068098fb597db611770d0891c3b0ca9..c46174d78a49995b6b202640b7ef1a28f37a3349 100644 (file)
--- 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 5d612dd78b2412861aad07915457ed4e2c0236db..41529e0c2d92293b58bcd9c16d33382183b54d4b 100644 (file)
--- 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>