From: Tom Hughes <tom@compton.nu>
Date: Sat, 4 Jul 2020 09:39:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2688'
X-Git-Tag: live~3306
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b8eaf227d9cfd96343cc11a595fff76990c2789d?hp=62fb6cb1afdb41810525baafb1d860338b5a8d6b

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a13f73d7a..39cdaa47a 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1640,17 +1640,6 @@ tr.turn:hover {
   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 */
 
 .flash {
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 7cf674fef..080503f72 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -13,11 +13,11 @@
 
   <div class="richtext"><%= @message.body.to_html %></div>
 
-  <div class='message-buttons buttons'>
-    <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %>
-    <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %>
-    <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %>
-    <%= link_to t(".back"), inbox_messages_path, :class => "button deemphasize" %>
+  <div>
+    <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
+    <%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
+    <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-primary" %>
+    <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
   </div>
 
 <% else %>
@@ -34,8 +34,8 @@
 
   <div class="richtext"><%= @message.body.to_html %></div>
 
-  <div class='message-buttons buttons'>
-    <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
+  <div>
+    <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
   </div>
 
 <% end %>