Skip to content

Node.js based forum software built for the modern web

fix: closes #14432, dont show mobile nav on chat page

Barış Soner Uşaklı1633b476baf0
diff --git a/install/package.json b/install/package.json
index 2dccec04f4..71a5c98d3e 100644
--- a/install/package.json
+++ b/install/package.json
@@ -112,7 +112,7 @@
"nodebb-plugin-spam-be-gone": "2.3.4",
"nodebb-plugin-web-push": "0.8.1",
"nodebb-rewards-essentials": "1.0.3",
- "nodebb-theme-harmony": "3.0.14",
+ "nodebb-theme-harmony": "3.0.15",
"nodebb-theme-lavender": "8.0.6",
"nodebb-theme-peace": "3.0.6",
"nodebb-theme-persona": "15.0.11",
diff --git a/public/scss/chats.scss b/public/scss/chats.scss
index 83954d5b55..02193d9af0 100644
--- a/public/scss/chats.scss
+++ b/public/scss/chats.scss
@@ -96,21 +96,13 @@ body.page-user-chats {
.page-user-chats.chat-loaded {
padding-bottom: 4.75rem;
}
-}
-
-@include media-breakpoint-down(md) {
- .page-user-chats.chat-loaded {
- padding-bottom: initial;
+ .page-user-chats.chat-loaded .bottombar {
+ display: none!important;
}
[component="chat/nav-wrapper"] {
width: 100%;
}
-
- .page-user-chats.chat-loaded .bottombar {
- display: none!important;
- }
-
[component="chat/nav-wrapper"][data-loaded="1"] {
display: none!important;
}
@@ -120,6 +112,12 @@ body.page-user-chats {
}
}
+@include media-breakpoint-down(md) {
+ .page-user-chats.chat-loaded {
+ padding-bottom: initial;
+ }
+}
+
.chat-modal {
[component="chat/user/list/btn"], [component="chat/pinned/messages/btn"] {
display: none!important;
diff --git a/src/views/chats.tpl b/src/views/chats.tpl
index 1970101838..a3b408e29d 100644
--- a/src/views/chats.tpl
+++ b/src/views/chats.tpl
@@ -53,7 +53,7 @@
</div>
</div>
</div>
- <div component="chat/main-wrapper" class="flex-grow-1 ms-md-2 ps-md-2 border-1 border-start-md h-100" style="min-width: 0;" data-roomid="{roomId}">
+ <div component="chat/main-wrapper" class="flex-grow-1 ms-lg-2 ps-lg-2 border-1 border-start-lg h-100" style="min-width: 0;" data-roomid="{roomId}">
<!-- IMPORT partials/chats/message-window.tpl -->
</div>
<div class="imagedrop"><div>[[topic:composer.drag-and-drop-images]]</div></div>
diff --git a/src/views/partials/chats/message-window.tpl b/src/views/partials/chats/message-window.tpl
index a60a0aaed7..493de163ea 100644
--- a/src/views/partials/chats/message-window.tpl
+++ b/src/views/partials/chats/message-window.tpl
@@ -12,8 +12,8 @@
<span class="text-muted text-sm">[[modules:chat.no-active]]</span>
</div>
{{{ else }}}
- <div component="chat/header" class="d-flex align-items-center px-md-3 gap-3">
- <a href="#" data-action="close" role="button" class="flex-shrink-0 d-flex d-md-none btn btn-ghost border align-text-top"><i class="fa fa-chevron-left"></i></a>
+ <div component="chat/header" class="d-flex align-items-center px-lg-3 gap-3">
+ <a href="#" data-action="close" role="button" class="flex-shrink-0 d-flex d-lg-none btn btn-ghost border align-text-top"><i class="fa fa-chevron-left"></i></a>
<h5 component="chat/header/title" class="members flex-grow-1 fw-semibold tracking-tight mb-0 text-truncate text-nowrap" style="line-height: initial;">
{{{ if ./roomName }}}<i class="fa {icon} text-muted"></i> {roomName}{{{ else }}}{{tx(./chatWithMessage) }}{{{ end}}}
</h5>