LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-12-01 16:51:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into default-pfp

Browse source
This commit is contained in:
Dessalines 2023-06-17 07:57:13 -04:00 committed by GitHub
commit a63ee58cf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/css/themes/darkly-red.scss
View file

@ -1,2 +1,2 @@
@import "variables.darkly-red";
@import "bootstrap-v4/scss/bootstrap";
@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";

2
src/assets/css/themes/darkly.scss
View file

@ -1,2 +1,2 @@
@import "variables.darkly";
@import "bootstrap-v4/scss/bootstrap";
@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";

2
src/assets/css/themes/litely-red.scss
View file

@ -1,2 +1,2 @@
@import "variables.litely-red";
@import "bootstrap-v4/scss/bootstrap";
@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";

2
src/assets/css/themes/litely.scss
View file

@ -1,2 +1,2 @@
@import "variables.litely";
@import "bootstrap-v4/scss/bootstrap";
@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";

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

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

8
src/shared/components/app/styles.scss
View file

@ -1,6 +1,6 @@
// Custom css
@import "tributejs/dist/tribute.css";
@import "toastify-js/src/toastify.css";
@import "tippy.js/dist/tippy.css";
@import "bootstrap/dist/css/bootstrap-utilities.min.css";
@import "../../../../node_modules/tributejs/dist/tribute.css";
@import "../../../../node_modules/toastify-js/src/toastify.css";
@import "../../../../node_modules/tippy.js/dist/tippy.css";
@import "../../../../node_modules/bootstrap/dist/css/bootstrap-utilities.min.css";
@import "../../../assets/css/main.css";

2
src/shared/components/common/markdown-textarea.tsx
View file

@ -210,7 +210,7 @@ export class MarkdownTextArea extends Component<
<textarea
id={this.id}
className={classNames(
"form-control border-0 rounded-bottom",
"form-control border-0 rounded-top-0 rounded-bottom",
{
"d-none": this.state.previewMode,
}