From c185ef25984da52d494201d693618313f970284e Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 3 Aug 2022 18:25:22 +0100
Subject: [PATCH] Use standard bootstrap spacers, rather than custom css, to
 space out the elements

Also make the reporting text small, since it's not required reading in most circumstances.
---
 app/assets/stylesheets/common.scss | 4 ----
 app/views/browse/note.html.erb     | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cd3ae4889..1f80a9b5b 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -841,10 +841,6 @@ tr.turn:hover {
     }
   }
 
-  form.note-comment-resolve {
-    margin: 10px 0px 40px 0px;
-  }
-
   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 0706dbb46..fb186e55e 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -43,7 +43,7 @@
 
   <% if @note.status == "open" %>
     <% if current_user -%>
-      <form class="note-comment-resolve" action="#">
+      <form class="mb-3" action="#">
         <div class="mb-3">
           <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         </div>
@@ -57,7 +57,7 @@
       </form>
     <% end -%>
   <% else %>
-    <form class="note-comment-resolve" action="#">
+    <form class="mb-3" action="#">
       <input type="hidden" name="text" value="" autocomplete="off">
       <div class="btn-wrapper">
         <% if current_user and current_user.moderator? -%>
@@ -71,6 +71,6 @@
   <% end %>
 
   <% if current_user && current_user != @note.author %>
-    <p class="text-muted"><%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %></p>
+    <p><small class="text-muted"><%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %></small></p>
   <% end %>
 </div>
-- 
2.43.2