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

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 1c1da3677e167167eef8c9db1ba3db9b9d2b6ef4..d41fc7d532b04865a65cd1a068956e08ca64c86d 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,4 +1,3 @@
-//= require jquery-simulate/jquery.simulate
 //= require qs/dist/qs
 
 OSM.Search = function (map) {
@@ -44,17 +43,7 @@ OSM.Search = function (map) {
     .on("click", ".search_more a", clickSearchMore)
     .on("click", ".search_results_entry a.set_position", clickSearchResult)
     .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
-    .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult)
-    .on("mousedown", "li.search_results_entry:has(a.set_position)", function () {
-      var moved = false;
-      $(this).one("click", function (e) {
-        if (!moved && !$(e.target).is("a")) {
-          $(this).find("a.set_position").simulate("click", e);
-        }
-      }).one("mousemove", function () {
-        moved = true;
-      });
-    });
+    .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult);
 
   var markers = L.layerGroup().addTo(map);
 
@@ -94,8 +83,6 @@ OSM.Search = function (map) {
     }
 
     markers.addLayer(marker);
-
-    $(this).closest("li").addClass("selected");
   }
 
   function hideSearchResult() {
@@ -104,8 +91,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 fc1ef69267749dce92e255f54846823805c3decf..c0f6c367c85271d2dc615f0c761bd346de3fa24c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -15,10 +15,6 @@ p > img {
   max-width: 100%;
 }
 
-small, aside {
-  font-size: 12px;
-}
-
 time[title] {
   text-decoration: underline dotted;
 }
@@ -549,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 c46174d78a49995b6b202640b7ef1a28f37a3349..07549d69bb33e939238f98e6ef6d1e44eea4a816 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -4,15 +4,12 @@ $typeheight: 14px;
 
 $blue: #7092FF;
 $secondary: #888;
-$lightblue: #B8C5F0;
 $green: #7ebc6f;
 $vibrant-green: #76c551;
 $grey: #CCC;
-$lightgrey: #EEE;
 $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 %>