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.

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cd3ae4889ee489e04827a47d337f722668bf088c..1f80a9b5b520c08029d9965e273b92b731ec1429 100644 (file)
--- 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;
   .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 0706dbb464c1abfa33c9cd22328c9b66fc076038..fb186e55e49130f1360939fe687c815cd890f300 100644 (file)
--- 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 -%>
 
   <% 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>
         <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>
     <% 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? -%>
       <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 %>
   <% 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>
   <% end %>
 </div>