From 8cd83426ccd2f64f1f0021313b9bb953ba8f8260 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sat, 4 Jul 2020 11:20:46 +0200 Subject: [PATCH] Make the back button not look disabled This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable. Alternative implementation of #2386 --- app/assets/stylesheets/common.scss | 11 ----------- app/views/messages/show.html.erb | 14 +++++++------- 2 files changed, 7 insertions(+), 18 deletions(-) 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 @@
<%= @message.body.to_html %>
-
- <%= 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" %> +
+ <%= 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" %>
<% else %> @@ -34,8 +34,8 @@
<%= @message.body.to_html %>
-
- <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %> +
+ <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
<% end %> -- 2.43.2