cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-05-27 15:11:16 +01:00
commit a90302aecf
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/common.scss
View file

@ -112,6 +112,10 @@ header {
nav.primary {
margin-right: auto;
}
.username {
max-width: 12em;
}
}
nav.primary {

4
app/views/layouts/_header.html.erb
View file

@ -81,12 +81,12 @@
</ul>
<% if current_user && current_user.id %>
<div class='d-inline-flex dropdown user-menu logged-in'>
<button class='dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
<button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
<%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
<% if current_user.new_messages.size > 0 %>
<span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
<% end %>
<span class='username align-middle'>
<span class='username align-middle text-truncate'>
<%= current_user.display_name %>
</span>
</button>