mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-06-22 22:19:58 +02:00
Merge branch 'master' into develop
This commit is contained in:
@@ -107,7 +107,7 @@ function renderUser(event) {
|
||||
if (!event.user || event.user.system) {
|
||||
return '[[global:system-user]]';
|
||||
}
|
||||
return `${helpers.buildAvatar(event.user, '16px', true)} <a href="${relative_path}/user/${event.user.userslug}">${event.user.username}</a>`;
|
||||
return `${helpers.buildAvatar(event.user, '16px', true)} <a href="${relative_path}/user/${event.user.userslug}">${event.user.displayname}</a>`;
|
||||
}
|
||||
|
||||
function renderTimeago(event) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<div component="post/parent" data-parent-pid="{./parent.pid}" data-uid="{./parent.uid}" class="btn btn-ghost btn-sm d-flex gap-2 text-start flex-row mb-2" style="font-size: 13px;">
|
||||
<div class="d-flex gap-2 text-nowrap">
|
||||
<div><i class="fa fa-sm fa-reply opacity-50"></i></div>
|
||||
<div><i class="fa fa-fw fa-reply opacity-50"></i></div>
|
||||
<div class="d-flex flex-nowrap gap-1 align-items-center">
|
||||
<a href="{config.relative_path}/user/{./parent.user.userslug}" class="text-decoration-none lh-1">{buildAvatar(./parent.user, "14px", true, "not-responsive align-middle")}</a>
|
||||
<a href="{config.relative_path}/user/{./parent.user.userslug}" class="text-decoration-none lh-1">{buildAvatar(./parent.user, "16px", true, "not-responsive align-middle")}</a>
|
||||
<a class="fw-semibold" href="{config.relative_path}/user/{./parent.user.userslug}">{./parent.user.displayname}</a>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user