Merge branch 'develop' into 0valt/815/comment-notification-pings

Author: Oaphi

app/assets/stylesheets/users.scss

@@ -1,5 +1,16 @@
 @import 'variables';
 
+img {
+  &.header--item-image {
+    &.user-avatar {
+      align-items: center;
+      display: flex;
+      font-size: 0.75em;
+      overflow: hidden;
+    }
+  }
+}
+
 .user-list {
   display: grid;
   gap: 1em;

app/views/layouts/_header.html.erb

@@ -84,7 +84,9 @@ $(() => {
         </a>
         <%= link_to user_path(current_user), class: 'header--item is-complex is-visible-on-mobile',
                                              title: 'Manage profile' do %>
-          <img alt="user avatar" src="<%= avatar_url(current_user, 40) %>" class="header--item-image avatar-40">&nbsp;&nbsp;
+          <img alt="user avatar"
+               src="<%= avatar_url(current_user, 40) %>"
+               class="header--item-image user-avatar avatar-40">&nbsp;&nbsp;
           <span class="<%= SiteSetting['SiteHeaderIsDark'] ? 'has-color-white' : 'has-color-tertiary-600' %>"><%= current_user.reputation %></span>
         <% end %>
       <% end %>

app/views/posts/_expanded.html.erb

@@ -1,5 +1,5 @@
 <%#
-    Full post view, containing all details and interactions.
+   "Full post view, containing all details and interactions.
 
     Instance variables:
     ? @category  : Category the post belongs to, if any
@@ -13,7 +13,7 @@
     Variables:
       post         : the Post instance to display
     ? float_notice : whether to display the float notice
-%>
+"%>
 
 <% float_notice ||= false %>
 <% category ||= defined?(@category) && @category.id == post.category_id ? @category : post.category %>
@@ -259,7 +259,9 @@
                 <% end %>
               <% elsif current_user.present? %>
                 <% if post.pending_suggested_edit? %>
-                  <span class="tools--item">suggested edit pending...</span>
+                      <%= link_to 'suggested edit pending...',
+                                   suggested_edit_url(post.pending_suggested_edit.id),
+                                   class: "tools--item" %>
                 <% elsif post_type.is_freely_editable %>
                   <%= render 'posts/edit_link', post: post %>
                 <% else %>