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

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 351ec4c6a1edb73c43fd2c87167f5bab72b5afa0..3748f2f6587409b0c21166b1c24df2cb077cbd67 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,21 +1,21 @@
-<h4>
+<h4 class="details">
+  <%= t "browse.version" %>
+  #<%= common_details.version %>
+</h4>
+
+<p class="font-italic">
   <% if common_details.changeset.tags['comment'].present? %>
     <%= linkify(common_details.changeset.tags["comment"]) %>
   <% else %>
     <%= t "browse.no_comment" %>
   <% end %>
-</h4>
+</p>
 
 <div class="details">
   <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
         :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'),
         :user => changeset_user_link(common_details.changeset),
         :title => l(common_details.timestamp) %>
-</div>
-
-<div class="details">
-  <%= t "browse.version" %>
-  #<%= common_details.version %>
   &middot;
   <%= t "browse.in_changeset" %>
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index c15e1f8c61b932735f51a3288016e4af6e8ba334..1217c03be87d261951937d18d6a5453c69ffb562 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -6,7 +6,9 @@
 </h2>
 
 <div class="browse-section">
-  <h6><%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %></h6>
+  <p class="font-italic">
+    <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
+  </p>
   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index e3febb1c5ed0a96d48c4163f25d6e298fc263e42..267bdb5556b261dd4195cdb8c4b810c1ca4a1e75 100644 (file)
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -11,11 +11,11 @@
    end %>
 
 <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>
-  <h6>
+  <p class="font-italic">
     <a class="changeset_id text-dark" href="<%= changeset_path(changeset) %>">
       <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>
     </a>
-  </h6>
+  </p>
   <div class="comments comments-<%= changeset.comments.length %>">
     <%= changeset.comments.length %>
     <span class="icon note grey"></span>

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 4446c519d4c45012b85d4721b8a5014228092b5f..d46a619843f02d95f0c5d878025cac6df3fd7cbe 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -23,9 +23,9 @@
       <% if changeset %>
         <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %>
         <% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %>
-        "<%= link_to(comment,
-                     { :controller => "browse", :action => "changeset", :id => changeset.id },
-                     { :title => t("changesets.changeset.view_changeset_details") }) %>"
+        <q><%= link_to(comment,
+                       { :controller => "browse", :action => "changeset", :id => changeset.id },
+                       { :title => t("changesets.changeset.view_changeset_details") }) %></q>
       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>