cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move the search results to use list-group-flush

Browse source
This commit is contained in:
Andy Allan 2020-01-15 17:00:58 +01:00
parent 397d30c4e9
commit a3795cddbb
4 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/index/search.js
View file

@ -45,9 +45,9 @@ OSM.Search = function (map) {
$("#sidebar_content")
.on("click", ".search_more a", clickSearchMore)
.on("click", ".search_results_entry a.set_position", clickSearchResult)
.on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult)
.on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult)
.on("mousedown", "p.search_results_entry:has(a.set_position)", function () {
.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")) {

7
app/assets/stylesheets/common.scss
View file

@ -939,15 +939,8 @@ header .search_forms,
/* Rules for search sidebar */
#sidebar .search_results_entry {
ul {
padding: 0;
}
ul li {
border-bottom: $keyline;
cursor: pointer;
list-style-type: none;
&:first-child { border-top: $keyline; }
&.selected { background: $list-highlight; }
}

10
app/views/geocoder/results.html.erb
View file

@ -1,9 +1,13 @@
<% if @results.empty? %>
<p class="search_results_entry inner12"><%= t ".no_results" %></p>
<ul class="list-group list-group-flush">
<li class="list-group-item">
<%= t ".no_results" %>
</li>
</ul>
<% else %>
<ul class='results-list'>
<ul class='results-list list-group list-group-flush'>
<% @results.each do |result| %>
<li><p class="inner12 search_results_entry clearfix"><%= result_to_html(result) %></p></li>
<li class="list-group-item search_results_entry"><%= result_to_html(result) %></li>
<% end %>
</ul>
<% if @more_params %>