From 9603bb404e8fbc4eda8fc8876af53252afd86a59 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Wed, 14 Feb 2024 02:04:47 +0300
Subject: [PATCH] Adjust diary comment widths and borders

---
 app/assets/stylesheets/common.scss              | 11 ++++-------
 app/views/diary_entries/_diary_comment.html.erb |  4 ++--
 app/views/diary_entries/show.html.erb           |  6 ++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f0746117d..b5bd5adec 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -827,14 +827,11 @@ tr.turn:hover {
     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 238f4d43c..04e011574 100644
--- 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">
diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 317c54635..3312aa8f2 100644
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -12,8 +12,8 @@
 
 <%= 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 %>
@@ -30,8 +30,6 @@
   <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
-<hr>
-
 <div>
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
-- 
2.39.5