Update diary comments styling

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index abee14c392b565d7d9ee9dda11b76ec3e9438616..7b3bfde368191ad0d30113226152f2489f8c59c6 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1060,23 +1060,12 @@ tr.turn:hover {
   }
   .diary-comment {
     border-top: 1px dashed $grey;
-    padding-top: $lineheight/2;
-    padding-bottom: $lineheight/2;
     &:first-child {
-      margin-top: $lineheight/2;
-      padding-top: $lineheight;
       border-top: 1px solid $grey;
     }
-    &.deleted {
-      background-color: #fee;
-    }
     p {
       margin-bottom: $lineheight/2;
     }
-    .comment-heading {
-      margin-bottom: 0;
-      margin-top: 0;
-    }
   }
 }
 

diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index 403d30742d982a45d1b08ba237621f2a1fa30581..238f4d43c8549a02e4e7a8f2fcbbe4d08f66e733 100644 (file)
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,9 +1,9 @@
-<div class="row diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
+<div class="row diary-comment py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
   <div class="col-auto">
     <%= user_thumbnail diary_comment.user %>
   </div>
   <div class="col">
-    <p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
+    <p class="text-muted m-0" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
       <% if current_user and diary_comment.user.id != current_user.id %>
         | <%= report_link(t(".report"), diary_comment) %>
       <% end %>

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 8792074951ce6efd1d9ca64bec76ede8137162fe..ab45a24b68242ea1eb602cb9445aa0a9a0315a77 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -13,7 +13,7 @@
 <%= render @entry %>
 
 <a id="comments"></a>
-<div class='comments'>
+<div class='comments mt-2'>
 <%= render :partial => "diary_comment", :collection => @comments %>
 </div>