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

[rails.git] / app / views / browse / changeset.html.erb

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 89ecdd50e0253013cd61a3dd8ffea1df1c7868b5..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">
 </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") %>
   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>


@@ -34,7 +36,7 @@
           <% @comments.each do |comment| %>
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
           <% @comments.each do |comment| %>
             <% if comment.visible %>
               <li id="c<%= comment.id %>">

-                <small class='deemphasize'>
+                <small class='text-muted'>

                   <%= t(".commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
                   <%= t(".commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),


@@ -47,7 +49,7 @@
               </li>
             <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">
               </li>
             <% elsif current_user and current_user.moderator? %>
               <li id="c<%= comment.id %>">

-                <small class='deemphasize'>
+                <small class='text-muted'>

                   <%= t(".hidden_commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),
                   <%= t(".hidden_commented_by",
                         :when => friendly_date_ago(comment.created_at),
                         :exact_time => l(comment.created_at),


@@ -128,7 +130,7 @@
       &middot;
     <% end %>
     <%= user = (@prev_by_user || @next_by_user).user.display_name
       &middot;
     <% end %>
     <%= user = (@prev_by_user || @next_by_user).user.display_name

-        link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %>
+        link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>

     <% if @next_by_user %>
       &middot;
       <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
     <% if @next_by_user %>
       &middot;
       <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>