fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-30 17:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(navbar): Add labels for navbar items on mobile (#1323)

Browse source 
* feat(navbar): Add labels for navbar items on mobile

* fix(navbar): Fix icons positioning on desktop

---------

Co-authored-by: Marcin Mróz <marcin.mroz@displate.com>
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
This commit is contained in:
Marcin Mróz 2023-06-17 13:55:59 +02:00 committed by GitHub
parent 35a59a4ebf
commit 7c2a471031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/shared/components/app/navbar.tsx
View file

@ -224,11 +224,14 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
)} )}
<li className="nav-item"> <li className="nav-item">
<a <a
className="nav-link" className="nav-link d-inline-flex align-items-center d-md-inline-block"
title={i18n.t("support_lemmy")} title={i18n.t("support_lemmy")}
href={donateLemmyUrl} href={donateLemmyUrl}
> >
<Icon icon="heart" classes="small" /> <Icon icon="heart" classes="small" />
<span className="d-inline ml-1 d-md-none ml-md-0">
{i18n.t("support_lemmy")}
</span>
</a> </a>
</li> </li>
</ul> </ul>
@ -236,22 +239,28 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
<li id="navSearch" className="nav-item"> <li id="navSearch" className="nav-item">
<NavLink <NavLink
to="/search" to="/search"
className="nav-link" className="nav-link d-inline-flex align-items-center d-md-inline-block"
title={i18n.t("search")} title={i18n.t("search")}
onMouseUp={linkEvent(this, handleCollapseClick)} onMouseUp={linkEvent(this, handleCollapseClick)}
> >
<Icon icon="search" /> <Icon icon="search" />
<span className="d-inline ml-1 d-md-none ml-md-0">
{i18n.t("search")}
</span>
</NavLink> </NavLink>
</li> </li>
{amAdmin() && ( {amAdmin() && (
<li id="navAdmin" className="nav-item"> <li id="navAdmin" className="nav-item">
<NavLink <NavLink
to="/admin" to="/admin"
className="nav-link" className="nav-link d-inline-flex align-items-center d-md-inline-block"
title={i18n.t("admin_settings")} title={i18n.t("admin_settings")}
onMouseUp={linkEvent(this, handleCollapseClick)} onMouseUp={linkEvent(this, handleCollapseClick)}
> >
<Icon icon="settings" /> <Icon icon="settings" />
<span className="d-inline ml-1 d-md-none ml-md-0">
{i18n.t("admin_settings")}
</span>
</NavLink> </NavLink>
</li> </li>
)} )}
@ -259,7 +268,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
<> <>
<li id="navMessages" className="nav-item"> <li id="navMessages" className="nav-item">
<NavLink <NavLink
className="nav-link" className="nav-link d-inline-flex align-items-center d-md-inline-block"
to="/inbox" to="/inbox"
title={i18n.t("unread_messages", { title={i18n.t("unread_messages", {
count: Number(this.unreadInboxCount), count: Number(this.unreadInboxCount),
@ -268,6 +277,12 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
onMouseUp={linkEvent(this, handleCollapseClick)} onMouseUp={linkEvent(this, handleCollapseClick)}
> >
<Icon icon="bell" /> <Icon icon="bell" />
<span className="badge badge-light d-inline ml-1 d-md-none ml-md-0">
{i18n.t("unread_messages", {
count: Number(this.unreadInboxCount),
formattedCount: numToSI(this.unreadInboxCount),
})}
</span>
{this.unreadInboxCount > 0 && ( {this.unreadInboxCount > 0 && (
<span className="mx-1 badge badge-light"> <span className="mx-1 badge badge-light">
{numToSI(this.unreadInboxCount)} {numToSI(this.unreadInboxCount)}
@ -278,7 +293,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
{this.moderatesSomething && ( {this.moderatesSomething && (
<li id="navModeration" className="nav-item"> <li id="navModeration" className="nav-item">
<NavLink <NavLink
className="nav-link" className="nav-link d-inline-flex align-items-center d-md-inline-block"
to="/reports" to="/reports"
title={i18n.t("unread_reports", { title={i18n.t("unread_reports", {
count: Number(this.unreadReportCount), count: Number(this.unreadReportCount),
@ -287,6 +302,12 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
onMouseUp={linkEvent(this, handleCollapseClick)} onMouseUp={linkEvent(this, handleCollapseClick)}
> >
<Icon icon="shield" /> <Icon icon="shield" />
<span className="badge badge-light d-inline ml-1 d-md-none ml-md-0">
{i18n.t("unread_reports", {
count: Number(this.unreadReportCount),
formattedCount: numToSI(this.unreadReportCount),
})}
</span>
{this.unreadReportCount > 0 && ( {this.unreadReportCount > 0 && (
<span className="mx-1 badge badge-light"> <span className="mx-1 badge badge-light">
{numToSI(this.unreadReportCount)} {numToSI(this.unreadReportCount)}
@ -299,7 +320,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
<li id="navApplications" className="nav-item"> <li id="navApplications" className="nav-item">
<NavLink <NavLink
to="/registration_applications" to="/registration_applications"
className="nav-link" className="nav-link d-inline-flex align-items-center d-md-inline-block"
title={i18n.t("unread_registration_applications", { title={i18n.t("unread_registration_applications", {
count: Number(this.unreadApplicationCount), count: Number(this.unreadApplicationCount),
formattedCount: numToSI(this.unreadApplicationCount), formattedCount: numToSI(this.unreadApplicationCount),
@ -307,6 +328,12 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
onMouseUp={linkEvent(this, handleCollapseClick)} onMouseUp={linkEvent(this, handleCollapseClick)}
> >
<Icon icon="clipboard" /> <Icon icon="clipboard" />
<span className="badge badge-light d-inline ml-1 d-md-none ml-md-0">
{i18n.t("unread_registration_applications", {
count: Number(this.unreadApplicationCount),
formattedCount: numToSI(this.unreadApplicationCount),
})}
</span>
{this.unreadApplicationCount > 0 && ( {this.unreadApplicationCount > 0 && (
<span className="mx-1 badge badge-light"> <span className="mx-1 badge badge-light">
{numToSI(this.unreadApplicationCount)} {numToSI(this.unreadApplicationCount)}