Adjust diary comment widths and borders

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f0746117d7b53dcd29010e509c1d2225b363835c..b5bd5adec641cf06afe707334796584904aae21c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -827,14 +827,11 @@ tr.turn:hover {
     height: 400px;
     display: none;
   }
     height: 400px;
     display: none;
   }

-  .comments {
-    max-width: 740px;
+  .diary-comment .col-auto {
+    width: 62px;

   }
   }

-  .diary-comment {
-    border-top: 1px dashed $grey;
-    &:first-child {
-      border-top: 1px solid $grey;
-    }
+  .diary-comment .col {
+    max-width: 690px;

   }
 }
 
   }
 }
 

diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index 238f4d43c8549a02e4e7a8f2fcbbe4d08f66e733..04e01157460ac38cf82ac54f30b2fd771a17f758 100644 (file)
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,5 +1,5 @@
-<div class="row diary-comment py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
-  <div class="col-auto">
+<div class="row diary-comment border-bottom py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
+  <div class="col-auto pe-0 text-center">

     <%= user_thumbnail diary_comment.user %>
   </div>
   <div class="col">
     <%= user_thumbnail diary_comment.user %>
   </div>
   <div class="col">

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 317c546350e07f9fb180d6cc1620763d048dc722..3312aa8f23b2052f1b3d6a06d9c92c1b8496ec3e 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -12,8 +12,8 @@
 
 <%= render @entry %>
 
 
 <%= render @entry %>
 

-<div id="comments" class="comments">
-  <div class="row">
+<div id="comments" class="comments mb-3">
+  <div class="row border-bottom border-grey">

     <h2 class="col"><%= t(".discussion") %></h2>
 
     <% if current_user %>
     <h2 class="col"><%= t(".discussion") %></h2>
 
     <% if current_user %>


@@ -30,8 +30,6 @@
   <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
   <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 

-<hr>
-

 <div>
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
 <div>
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>