From: Tom Hughes Date: Wed, 24 Apr 2024 16:55:33 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4711' X-Git-Tag: live~1102 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/75438093ee64a3481cd9f1bca36a2881e3640b75?hp=3c2780f2c3463cbaa6953d7ee8edec93baa863dd Merge remote-tracking branch 'upstream/pull/4711' --- 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 = $("
  • ") - .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) { $("
  • ") - .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) { $("
  • ") - .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(); $("
  • ") - .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;