From daf7172f12c74a071d8b91db6a241a35cad6cd50 Mon Sep 17 00:00:00 2001
From: Max Magorsch <arzano@gentoo.org>
Date: Fri, 21 Feb 2020 01:55:29 +0100
Subject: Clean up the changelogs

Signed-off-by: Max Magorsch <arzano@gentoo.org>
---
 app/views/packages/_changelog_entry.html.erb | 18 ++++++++----------
 app/webpack/src/stylesheets/packages.scss    |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/views/packages/_changelog_entry.html.erb b/app/views/packages/_changelog_entry.html.erb
index a48b892..a9c93ab 100644
--- a/app/views/packages/_changelog_entry.html.erb
+++ b/app/views/packages/_changelog_entry.html.erb
@@ -1,18 +1,16 @@
 <li class="list-group-item">
-  <strong><%= annotate_bugs changelog.message.lines.first %></strong>
+  <strong><%= annotate_bugs changelog.message.lines.first %></strong><span class="float-right" style="font-size:0.825rem;"><%= link_to_gitweb_commit changelog.id%></span>
   <div class="kk-byline">
 
-    <img class="rounded-sm inline" data-toggle="popover" data-img="http://placehold.it/400x200" src="<%= gravatar_url changelog.author_email %>">
-    <%= mail_to changelog.author_email, changelog.author_name %>
-    <%= i18n_date(changelog.author_date) %>,
-
-    <% if changelog.author_name != changelog.committer_name || changelog.author_date != changelog.committer_date %>
-      <img class="rounded-sm inline" src="<%= gravatar_url changelog.committer_email %>">
-      <%= mail_to changelog.committer_email, changelog.committer_name%>
-      <%= i18n_date(changelog.committer_date) %>,
+    <% if changelog.author_name != changelog.committer_name %>
+      <span data-toggle="tooltip" title="authored on <%= changelog.author_date %>"><img class="rounded-sm inline" data-toggle="popover" data-img="http://placehold.it/400x200" src="<%= gravatar_url changelog.author_email %>">
+      <%= mail_to changelog.author_email, changelog.author_name %> authored</span> and&nbsp;
     <% end %>
 
-    commit <%= link_to_gitweb_commit changelog.id%>
+    <img class="rounded-sm inline" src="<%= gravatar_url changelog.committer_email %>">
+    <%= mail_to changelog.committer_email, changelog.committer_name%> committed on
+    <%= i18n_date(changelog.committer_date) %>
+
   </div>
 
   <table class="table table-condensed kk-changelog-diffstat">
diff --git a/app/webpack/src/stylesheets/packages.scss b/app/webpack/src/stylesheets/packages.scss
index 9b0379e..e4acf30 100644
--- a/app/webpack/src/stylesheets/packages.scss
+++ b/app/webpack/src/stylesheets/packages.scss
@@ -71,6 +71,7 @@
 
 .kk-commit {
   font-family: monospace;
+  color: #8a8a8a;
 }
 
 .kk-changelog-diffstat {
-- 
cgit v1.2.3-65-gdbad