From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Jan 2020 10:10:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2497'
X-Git-Tag: live~2900
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d76756d202aa3e3e12004e3a9f31898292b078d6?hp=6ed8624851877a01b9861ffc6d94aa99425715c6

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

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 5c6e58170..514d6dbb2 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -214,17 +214,15 @@ OSM.Query = function (map) {
 
           if (interestingFeature(element)) {
             var $li = $("<li>")
-              .addClass("query-result")
+              .addClass("query-result list-group-item")
               .data("geometry", featureGeometry(element))
-              .appendTo($ul);
-            var $p = $("<p>")
               .text(featurePrefix(element) + " ")
-              .appendTo($li);
+              .appendTo($ul);
 
             $("<a>")
               .attr("href", "/" + element.type + "/" + element.id)
               .text(featureName(element))
-              .appendTo($p);
+              .appendTo($li);
           }
         }
 
diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss
index 96d37415f..c07fc2d07 100644
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -32,7 +32,7 @@
 @import "bootstrap/alert";
 // @import "bootstrap/progress";
 // @import "bootstrap/media";
-// @import "bootstrap/list-group";
+@import "bootstrap/list-group";
 // @import "bootstrap/close";
 // @import "bootstrap/toasts";
 // @import "bootstrap/modal";
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3d013339d..e660a0930 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1108,21 +1108,12 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
-    padding: 15px 20px;
-    border-bottom: 1px solid $grey;
     cursor: pointer;
 
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
   }
 
-  h4 {
-    margin: 0;
-    a {
-      color: #000;
-    }
-  }
-
   .comments {
     float: right;
     color: $darkgrey;
@@ -1191,7 +1182,6 @@ tr.turn:hover {
     background-color: #F6F6F6;
     border: 1px solid $grey;
     border-radius: 3px;
-    font-size: 12px;
     table-layout: fixed;
     border-collapse: separate;
 
@@ -1223,8 +1213,8 @@ tr.turn:hover {
 
     .colour-preview-box {
       float: right;
-      width: 12px;
-      height: 12px;
+      width: 14px;
+      height: 14px;
       margin: 4px 0px;
       border: 1px solid rgba(0, 0, 0, .1);
       // add color via inline css on element: background-color: <tag value>;
@@ -1277,17 +1267,10 @@ tr.turn:hover {
 
   .query-results {
     display: none;
-
-    h3 {
-      padding: $lineheight $lineheight $lineheight/2;
-      margin: 0;
-    }
+    padding: 0 $lineheight $lineheight/2;
 
     ul {
       li {
-        padding: 15px 20px;
-        border-bottom: 1px solid $grey;
-
         &.query-result {
           cursor: pointer;
         }
@@ -2094,13 +2077,6 @@ abbr.geo {
   border-bottom: none;
 }
 
-/* Rules for RSS buttons */
-
-.rsssmall {
-  position: relative;
-  top: 3px;
-}
-
 /* General styles for action lists / subnavs / pager navs */
 
 ul.secondary-actions {
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 9ad35b2a7..148cb5a88 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -6,7 +6,7 @@
 </h2>
 
 <div class="browse-section">
-  <h4><%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %></h4>
+  <h6><%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %></h6>
   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
diff --git a/app/views/browse/query.html.erb b/app/views/browse/query.html.erb
index ea40a00db..ad6fdddb5 100644
--- a/app/views/browse/query.html.erb
+++ b/app/views/browse/query.html.erb
@@ -12,11 +12,15 @@
 <div id="query-nearby" class="query-results">
   <h3><%= t(".nearby") %></h3>
   <%= image_tag "searching.gif", :class => "loader" %>
-  <ul class="query-results-list"></ul>
+  <div>
+    <ul class="query-results-list list-group list-group-flush"></ul>
+  </div>
 </div>
 
 <div id="query-isin" class="query-results">
   <h3><%= t(".enclosing") %></h3>
   <%= image_tag "searching.gif", :class => "loader" %>
-  <ul class="query-results-list"></ul>
+  <div>
+    <ul class="query-results-list list-group list-group-flush"></ul>
+  </div>
 </div>
diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index 56726e2d9..f1173671e 100644
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -10,12 +10,12 @@
      }
    end %>
 
-<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data } do %>
-  <h4>
-    <a class="changeset_id" href="<%= changeset_path(changeset) %>">
+<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
+  <h6>
+    <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
       <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
     </a>
-  </h4>
+  </h6>
   <div class="comments comments-<%= changeset.comments.length %>">
     <%= changeset.comments.length %>
     <span class="icon note grey"></span>
diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index 1e3daa081..527a0a232 100644
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,5 +1,5 @@
 <% if @changesets.present? %>
-  <ol class="changesets">
+  <ol class="changesets list-group list-group-flush">
     <%= render @changesets %>
   </ol>
 <% if @changesets.size == 20 -%>