Remove message date float

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 779fbbe35d0fbe705c308258ce30b104dabe1cb4..5e0c00259c2a0720ff678e47eb4e68d2f53696ca 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1144,10 +1144,6 @@ tr.turn:hover {
   .inbox-row-unread {
     background: #CBEEA7;
   }
   .inbox-row-unread {
     background: #CBEEA7;
   }

-
-  .right {
-    float: right;
-  }

 }
 
 .inbox-row .inbox-mark-read {
 }
 
 .inbox-row .inbox-mark-read {

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 9ade68121aab29d9e7bac8f9bdcde705c87ac81c..ef8f472fc0579cb9575f13270ee525187726ddcd 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -3,12 +3,12 @@
 <% end %>
 
 <% if current_user == @message.recipient %>
 <% end %>
 
 <% if current_user == @message.recipient %>

-  <div class='info-line clearfix'>
+  <div class='info-line d-flex gap-1 flex-wrap'>

     <%= user_thumbnail_tiny @message.sender %>
     <%= link_to @message.sender.display_name, user_path(@message.sender) %></td>
     <%= user_thumbnail_tiny @message.sender %>
     <%= link_to @message.sender.display_name, user_path(@message.sender) %></td>

-    <div class='right'>
+    <span class="ms-auto">

       <%= l @message.sent_on, :format => :friendly %>
       <%= l @message.sent_on, :format => :friendly %>

-    </div>
+    </span>

   </div>
 
   <div class="richtext text-break"><%= @message.body.to_html %></div>
   </div>
 
   <div class="richtext text-break"><%= @message.body.to_html %></div>


@@ -20,12 +20,12 @@
     <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
   </div>
 <% else %>
     <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
   </div>
 <% else %>

-  <div class='info-line clearfix'>
+  <div class='info-line d-flex gap-1 flex-wrap'>

     <%= user_thumbnail_tiny @message.recipient %>
     <%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>
     <%= user_thumbnail_tiny @message.recipient %>
     <%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>

-    <div class='right'>
+    <span class="ms-auto">

       <%= l @message.sent_on, :format => :friendly %>
       <%= l @message.sent_on, :format => :friendly %>

-    </div>
+    </span>

   </div>
 
   <div class="richtext text-break"><%= @message.body.to_html %></div>
   </div>
 
   <div class="richtext text-break"><%= @message.body.to_html %></div>