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

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 1c1da3677e167167eef8c9db1ba3db9b9d2b6ef4..b23dea69ae0d2711ca031e5f9547b9d361e049f2 100644 (file)
--- 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 d4bc31255aee675d1dee3d19dfe4c32345ad0ae0..ca9a820f9780b58a4329bbaf861ecb1ea64c331f 100644 (file)
--- 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 97514d5ca4048c46f6d2c4d1bba979df0718d845..07549d69bb33e939238f98e6ef6d1e44eea4a816 100644 (file)
--- 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 fc213831895d264edb840b95475f65a3077a3929..05d7d5d637e8e1dee29c2832a99d5de21b52c834 100644 (file)
--- 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 %>