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

Merge remote-tracking branch 'upstream/pull/2688'

Browse source
This commit is contained in:
Tom Hughes 2020-07-04 10:39:07 +01:00
commit b8eaf227d9
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1640,17 +1640,6 @@ tr.turn:hover {
display: none; display: none;
} }
.messages-show .message-buttons {
margin-top: $lineheight;
margin-bottom: $lineheight * 1.5;
padding-top: $lineheight;
border-top: 1px solid $lightgrey;
}
.messages-show .buttons .mark-unread-button {
border-radius: 0;
}
/* Rules for "flash" notice boxes shown at the top of the content area */ /* Rules for "flash" notice boxes shown at the top of the content area */
.flash { .flash {

14
app/views/messages/show.html.erb
View file

@ -13,11 +13,11 @@
<div class="richtext"><%= @message.body.to_html %></div> <div class="richtext"><%= @message.body.to_html %></div>
<div class='message-buttons buttons'> <div>
<%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %> <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
<%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %> <%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
<%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %> <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-primary" %>
<%= link_to t(".back"), inbox_messages_path, :class => "button deemphasize" %> <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
</div> </div>
<% else %> <% else %>
@ -34,8 +34,8 @@
<div class="richtext"><%= @message.body.to_html %></div> <div class="richtext"><%= @message.body.to_html %></div>
<div class='message-buttons buttons'> <div>
<%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %> <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
</div> </div>
<% end %> <% end %>