gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Merge remote-tracking branch 'parent/main' into upstream-20241006

Browse source
This commit is contained in:
KMY 2024-10-05 09:10:58 +09:00
commit 66bed31dbe
226 changed files with 2688 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/ui/components/column_link.jsx
View file

@ -16,7 +16,7 @@ const ColumnLink = ({ icon, activeIcon, iconComponent, activeIconComponent, text
if (href) {
return (
<a href={href} className={className} data-method={method} title={text} {...other}>
<a href={href} className={className} data-method={method} {...other}>
{active ? activeIconElement : iconElement}
<span>{text}</span>
{badgeElement}
@ -24,7 +24,7 @@ const ColumnLink = ({ icon, activeIcon, iconComponent, activeIconComponent, text
);
} else {
return (
<NavLink to={to} className={className} title={text} exact {...other}>
<NavLink to={to} className={className} exact {...other}>
{active ? activeIconElement : iconElement}
<span>{text}</span>
{badgeElement}