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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d73d40ff06d72a524b29b3fb848d2093b8f51182..c3f71438988c252f5f7ef160ef8ddd513e473f24 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -593,8 +593,9 @@ tr.turn {
 
 #sidebar .changesets {
   li {
-    &.selected { background: $list-highlight; }
-    /* color is derived from changeset bbox fillColor in history.js */
+    &.selected {
+      @extend :hover;
+    }
 
     a.stretched-link > span, a:not(.stretched-link), [title] {
       position: relative;

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index b219f4c327498c4afdb92910f98bb08040d6139b..6362330a9c58d117bb92e747879467a649bc2072 100644 (file)
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -10,7 +10,7 @@
      }
    end %>
 
-<%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
+<%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item list-group-item-action" do %>
   <p class="fst-italic">
     <a class="changeset_id link-body-emphasis stretched-link" href="<%= changeset_path(changeset) %>">
       <span><%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %></span>