Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Truncate usernames in block navigation tabs #5366

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Truncate usernames in block navigation tabs #5366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/assets/stylesheets/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,11 @@ div.secondary-actions {
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 {
--bs-border-color: var(--bs-secondary-border-subtle);
Expand Down
4 changes: 2 additions & 2 deletions app/views/user_blocks/_navigation.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<% on_user = @user || @user_block&.user %>
<% if on_user != current_user && on_user&.blocks&.exists? %>
<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),
:class => ["nav-link", { :active => action_name == "blocks_on" }] %>
</li>
Expand All @@ -29,7 +29,7 @@
<% by_user = @user || @user_block&.creator %>
<% if by_user != current_user && by_user&.blocks_created&.exists? %>
<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),
:class => ["nav-link", { :active => action_name == "blocks_by" }] %>
</li>
Expand Down
4 changes: 2 additions & 2 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2925,9 +2925,9 @@ en:
navigation:
all_blocks: "All Blocks"
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_user: "Blocks by %{user}"
blocks_by_user_html: "Blocks by %{user}"
block: "Block #%{id}"
new_block: "New Block"
user_mutes:
Expand Down