Merge branch 'master' into HEAD

[rails.git] / app / views / messages / inbox.html.erb

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index a5e89d023196622aa6daa0649d4955aef5bcc78c..4f2925b149e386f86fa4e07c372c8ec5152797fd 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -2,13 +2,16 @@
   <%= javascript_include_tag "messages" %>
 <% end %>
 
   <%= javascript_include_tag "messages" %>
 <% end %>
 

+<% content_for :heading_class, "pb-0" %>
+

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <ul class="nav nav-pills">
+  <h1><%= t("users.show.my messages") %></h1>
+  <ul class="nav nav-tabs">

     <li class="nav-item">
       <a class="nav-link active"><%= t ".my_inbox" %></a>
     </li>
     <li class="nav-item">
     <li class="nav-item">
       <a class="nav-link active"><%= t ".my_inbox" %></a>
     </li>
     <li class="nav-item">

-      <%= link_to t(".my_outbox"), outbox_messages_path, class => "nav-link" %>
+      <%= link_to t(".my_outbox"), outbox_messages_path, :class => "nav-link" %>

     </li>
   </ul>
 <% end %>
     </li>
   </ul>
 <% end %>