From 366acfe10648631e134a0c728b82d077d5705ea1 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Fri, 16 Jun 2023 23:32:59 -0400
Subject: [PATCH 1/3] Revert "fix: Sass files don't need to refer to full
 node_modules path"

This reverts commit ab92d7264d547c2c49e5a6a530fd8db85a4a5f3a.
---
 src/assets/css/themes/darkly-red.scss | 2 +-
 src/assets/css/themes/darkly.scss     | 2 +-
 src/assets/css/themes/litely-red.scss | 2 +-
 src/assets/css/themes/litely.scss     | 2 +-
 src/shared/components/app/styles.scss | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/css/themes/darkly-red.scss b/src/assets/css/themes/darkly-red.scss
index f6579a3a..f6dfb3df 100644
--- a/src/assets/css/themes/darkly-red.scss
+++ b/src/assets/css/themes/darkly-red.scss
@@ -1,2 +1,2 @@
 @import "variables.darkly-red";
-@import "bootstrap-v4/scss/bootstrap";
+@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";
diff --git a/src/assets/css/themes/darkly.scss b/src/assets/css/themes/darkly.scss
index 657344fc..ef808d56 100644
--- a/src/assets/css/themes/darkly.scss
+++ b/src/assets/css/themes/darkly.scss
@@ -1,2 +1,2 @@
 @import "variables.darkly";
-@import "bootstrap-v4/scss/bootstrap";
+@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";
diff --git a/src/assets/css/themes/litely-red.scss b/src/assets/css/themes/litely-red.scss
index 400b6cea..388d70bd 100644
--- a/src/assets/css/themes/litely-red.scss
+++ b/src/assets/css/themes/litely-red.scss
@@ -1,2 +1,2 @@
 @import "variables.litely-red";
-@import "bootstrap-v4/scss/bootstrap";
+@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";
diff --git a/src/assets/css/themes/litely.scss b/src/assets/css/themes/litely.scss
index 8001586b..061bcc48 100644
--- a/src/assets/css/themes/litely.scss
+++ b/src/assets/css/themes/litely.scss
@@ -1,2 +1,2 @@
 @import "variables.litely";
-@import "bootstrap-v4/scss/bootstrap";
+@import "../../../../node_modules/bootstrap-v4/scss/bootstrap";
diff --git a/src/shared/components/app/styles.scss b/src/shared/components/app/styles.scss
index 4d764cde..559f619f 100644
--- a/src/shared/components/app/styles.scss
+++ b/src/shared/components/app/styles.scss
@@ -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";

From fef03525f1a53abc7e1b34ed894bf56a2c1ff6bc Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sat, 17 Jun 2023 01:43:05 -0400
Subject: [PATCH 2/3] fix: Fix rounded top corners in markdown textarea

---
 src/shared/components/common/markdown-textarea.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx
index 1a06d3db..01fa6155 100644
--- a/src/shared/components/common/markdown-textarea.tsx
+++ b/src/shared/components/common/markdown-textarea.tsx
@@ -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,
                     }

From 7c2a471031a58a5703da9fee466aff99d77c7213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Mr=C3=B3z?= <mrfrostn@gmail.com>
Date: Sat, 17 Jun 2023 13:55:59 +0200
Subject: [PATCH 3/3] feat(navbar): Add labels for navbar items on mobile
 (#1323)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>
---
 src/shared/components/app/navbar.tsx | 39 +++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/shared/components/app/navbar.tsx b/src/shared/components/app/navbar.tsx
index c17837c9..a19ea5c5 100644
--- a/src/shared/components/app/navbar.tsx
+++ b/src/shared/components/app/navbar.tsx
@@ -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)}