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

[rails.git] / app / views / notes / show.html.erb

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 3a1224676e47b7e5afb0c8deba255b48a32a65a1..a04cbf9d9b215dee8fa5da9578bc27a0ef398c6c 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -4,7 +4,7 @@
 
 <div>
   <h4><%= t(".description") %></h4>
 
 <div>
   <h4><%= t(".description") %></h4>

-  <div class="note-description">
+  <div class="overflow-hidden ms-2">

     <%= h(@note_comments.first.body.to_html) %>
   </div>
 
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 


@@ -33,7 +33,7 @@
       <ul class="list-unstyled">
         <% @note_comments.drop(1).each do |comment| %>
           <li id="c<%= comment.id %>">
       <ul class="list-unstyled">
         <% @note_comments.drop(1).each do |comment| %>
           <li id="c<%= comment.id %>">

-            <small class='text-muted'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <small class='text-body-secondary'><%= note_event(comment.event, comment.created_at, comment.author) %></small>

             <div class="mx-2">
               <%= comment.body.to_html %>
             </div>
             <div class="mx-2">
               <%= comment.body.to_html %>
             </div>


@@ -51,7 +51,7 @@
         </div>
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
         </div>
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>

-        <div class="btn-wrapper">
+        <div class="d-flex flex-wrap gap-1">

           <% if current_user.moderator? -%>
             <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",
                                        :data => { :method => "DELETE",
           <% if current_user.moderator? -%>
             <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",
                                        :data => { :method => "DELETE",


@@ -75,7 +75,9 @@
   <% else %>
     <form class="mb-3" action="#">
       <input type="hidden" name="text" value="" autocomplete="off">
   <% else %>
     <form class="mb-3" action="#">
       <input type="hidden" name="text" value="" autocomplete="off">

-      <div class="btn-wrapper">
+      <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
+      </div>
+      <div class="d-flex flex-wrap gap-1">

         <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
           <input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
         <% end -%>
         <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
           <input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
         <% end -%>


@@ -88,7 +90,7 @@
 
   <% if current_user && current_user != @note.author %>
     <p>
 
   <% if current_user && current_user != @note.author %>
     <p>

-      <small class="text-muted">
+      <small class="text-body-secondary">

         <%= t ".report_link_html", :link => report_link(t(".report"), @note) %>
         <% if @note.status == "open" %>
           <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %>
         <%= t ".report_link_html", :link => report_link(t(".report"), @note) %>
         <% if @note.status == "open" %>
           <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %>


@@ -100,7 +102,7 @@
   <% end %>
 
   <% if @note.freshly_closed? %>
   <% end %>
 
   <% if @note.freshly_closed? %>

-    <small class="text-muted">
+    <small class="text-body-secondary">

       <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %>
     </small>
   <% end %>
       <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %>
     </small>
   <% end %>