Merge branch 'pull/3091'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 481025d81fac69e855a7ea1dc83fb743dc53ff6e..a8f138caa8194b4014c6a6d28c3360ee4156cfa7 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -975,6 +975,16 @@ tr.turn:hover {
   }
 }
 
+/* Bootstrap buttons don't have any vertical margin, so
+   they touch when adjacent buttons wrap onto a new line
+   e.g. wide form buttons on a narrow sidebar */
+
+.btn-wrapper {
+  > .btn {
+    margin-bottom: $spacer * 0.25;
+  }
+}
+
 /* Rules for export sidebar */
 
 .export_form {

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 1a792e873952ce3dc98b5d6b7ced79e6f27cdeb2..6dcd46e76435fa76d37f4d8f8171491b4c63ab74 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -51,7 +51,7 @@
         <div class="form-group">
           <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         </div>
-        <div>
+        <div class="btn-wrapper">
           <% if current_user.moderator? -%>
             <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">
           <% end -%>
@@ -63,7 +63,7 @@
   <% else %>
     <form action="#">
       <input type="hidden" name="text" value="">
-      <div>
+      <div class="btn-wrapper">
         <% if current_user and current_user.moderator? -%>
           <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">
         <% end -%>