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

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-02 15:00:45 +00:00
commit bc70cae711
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -938,7 +938,11 @@ div.secondary-actions {
max-width: 20em; max-width: 20em;
} }
/* Rules for tabs inside secondary background sections */ /* Rules for navigation tabs */
.nav-tabs .username {
max-width: 20em;
}
.bg-body-secondary .nav-tabs { .bg-body-secondary .nav-tabs {
--bs-border-color: var(--bs-secondary-border-subtle); --bs-border-color: var(--bs-secondary-border-subtle);

4
app/views/user_blocks/_navigation.html.erb
View file

@ -14,7 +14,7 @@
<% on_user = @user || @user_block&.user %> <% on_user = @user || @user_block&.user %>
<% if on_user != current_user && on_user&.blocks&.exists? %> <% if on_user != current_user && on_user&.blocks&.exists? %>
<li class="nav-item"> <li class="nav-item">
<%= link_to t(".blocks_on_user", :user => on_user.display_name), <%= link_to t(".blocks_on_user_html", :user => tag.span(on_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
user_blocks_on_path(on_user), user_blocks_on_path(on_user),
:class => ["nav-link", { :active => action_name == "blocks_on" }] %> :class => ["nav-link", { :active => action_name == "blocks_on" }] %>
</li> </li>
@ -29,7 +29,7 @@
<% by_user = @user || @user_block&.creator %> <% by_user = @user || @user_block&.creator %>
<% if by_user != current_user && by_user&.blocks_created&.exists? %> <% if by_user != current_user && by_user&.blocks_created&.exists? %>
<li class="nav-item"> <li class="nav-item">
<%= link_to t(".blocks_by_user", :user => by_user.display_name), <%= link_to t(".blocks_by_user_html", :user => tag.span(by_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
user_blocks_by_path(by_user), user_blocks_by_path(by_user),
:class => ["nav-link", { :active => action_name == "blocks_by" }] %> :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
</li> </li>

4
config/locales/en.yml
View file

@ -2925,9 +2925,9 @@ en:
navigation: navigation:
all_blocks: "All Blocks" all_blocks: "All Blocks"
blocks_on_me: "Blocks on Me" blocks_on_me: "Blocks on Me"
blocks_on_user: "Blocks on %{user}" blocks_on_user_html: "Blocks on %{user}"
blocks_by_me: "Blocks by Me" blocks_by_me: "Blocks by Me"
blocks_by_user: "Blocks by %{user}" blocks_by_user_html: "Blocks by %{user}"
block: "Block #%{id}" block: "Block #%{id}"
new_block: "New Block" new_block: "New Block"
user_mutes: user_mutes: