cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pull/3091'

Browse source
This commit is contained in:
Andy Allan 2021-02-24 10:49:39 +00:00
commit 3debff60ef
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/common.scss
View file

@ -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 */ /* Rules for export sidebar */
.export_form { .export_form {

4
app/views/browse/note.html.erb
View file

@ -51,7 +51,7 @@
<div class="form-group"> <div class="form-group">
<textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea> <textarea class="form-control" name="text" cols="40" rows="5" maxlength="2000"></textarea>
</div> </div>
<div> <div class="btn-wrapper">
<% if current_user.moderator? -%> <% 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") %>"> <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 -%> <% end -%>
@ -63,7 +63,7 @@
<% else %> <% else %>
<form action="#"> <form action="#">
<input type="hidden" name="text" value=""> <input type="hidden" name="text" value="">
<div> <div class="btn-wrapper">
<% if current_user and current_user.moderator? -%> <% 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") %>"> <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 -%> <% end -%>