Fixes for BS5

humhub · Jan 13, 2025 · de5411d · de5411d
1 parent a45cf92
commit de5411d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/resources/js/humhub.mail.inbox.js b/resources/js/humhub.mail.inbox.js
@@ -99,7 +99,7 @@ humhub.module('mail.inbox', function (module, require, $) {
     ConversationList.prototype.initScroll = function() {
         if (window.IntersectionObserver) {
 
-            var $streamEnd = $('<div class="inbox-stream-end"></div>');
+            var $streamEnd = $('<div class="inbox-stream-end stream-end"></div>');
             this.$.append($streamEnd);
 
             var that = this;

diff --git a/resources/js/humhub.mail.messenger.bundle.js b/resources/js/humhub.mail.messenger.bundle.js
@@ -552,7 +552,7 @@ humhub.module('mail.inbox', function (module, require, $) {
     ConversationList.prototype.initScroll = function() {
         if (window.IntersectionObserver) {
 
-            var $streamEnd = $('<div class="inbox-stream-end"></div>');
+            var $streamEnd = $('<div class="inbox-stream-end stream-end"></div>');
             this.$.append($streamEnd);
 
             var that = this;

diff --git a/resources/js/humhub.mail.messenger.bundle.min.js b/resources/js/humhub.mail.messenger.bundle.min.js
diff --git a/views/mail/conversation.php b/views/mail/conversation.php
@@ -41,7 +41,7 @@
 
         <div class="panel-body">
 
-            <div class="hh-list conversation-entry-list">
+            <div class="conversation-entry-list">
                 <?= Messages::widget(['message' => $message]) ?>
             </div>
 

diff --git a/widgets/views/notificationInbox.php b/widgets/views/notificationInbox.php
@@ -20,21 +20,25 @@
         <li>
             <div class="dropdown-header">
                 <div class="arrow"></div>
-                <h6><?= Yii::t('MailModule.base', 'Conversations') ?></h6>
-                <?= $canStartConversation
-                    ? NewMessageButton::widget(['id' => 'create-message-button', 'icon' => 'plus', 'label' => ''])
-                    : '' ?>
+                <?= Yii::t('MailModule.base', 'Conversations') ?>
+                <div class="dropdown-header-actions">
+                    <?= $canStartConversation
+                        ? NewMessageButton::widget(['id' => 'create-message-button', 'icon' => 'plus', 'label' => ''])
+                        : '' ?>
+                </div>
             </div>
         </li>
         <li>
-            <div class="dropdown-item">
+            <div class="dropdown-item hh-list">
                 <div id="loader_messages"></div>
             </div>
         </li>
         <li>
-            <a class="dropdown-item btn btn-light col-lg-12" href="<?= Url::toMessenger() ?>">
-                <?= Yii::t('MailModule.base', 'Show all messages') ?>
-            </a>
+            <div class="dropdown-footer">
+                <a class="btn btn-light col-lg-12" href="<?= Url::toMessenger() ?>">
+                    <?= Yii::t('MailModule.base', 'Show all messages') ?>
+                </a>
+            </div>
         </li>
     </ul>
 </div>