nodebb-theme-harmony 1.1.59 → 1.1.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nodebb-theme-harmony",
3
- "version": "1.1.59",
3
+ "version": "1.1.61",
4
4
  "nbbpm": {
5
5
  "compatibility": "^3.3.0"
6
6
  },
package/public/harmony.js CHANGED
@@ -9,6 +9,7 @@ $(document).ready(function () {
9
9
  handleMobileNavigator();
10
10
  setupNavTooltips();
11
11
  fixPlaceholders();
12
+ fixSidebarOverflow();
12
13
 
13
14
  function setupSkinSwitcher() {
14
15
  $('[component="skinSwitcher"]').on('click', '.dropdown-item', function () {
@@ -273,4 +274,14 @@ $(document).ready(function () {
273
274
  }
274
275
  });
275
276
  }
277
+
278
+ function fixSidebarOverflow() {
279
+ // overflow-y-auto needs to be removed on main-nav when dropdowns are opened
280
+ const mainNavEl = $('#main-nav');
281
+ mainNavEl.on('show.bs.dropdown', () => {
282
+ mainNavEl.removeClass('overflow-y-auto');
283
+ }).on('hide.bs.dropdown', () => {
284
+ mainNavEl.addClass('overflow-y-auto');
285
+ });
286
+ }
276
287
  });
@@ -14,9 +14,8 @@
14
14
  <span class="badge bg-danger">[[user:deleted]]</span>
15
15
  {{{ end }}}
16
16
  <span class="chat-timestamp text-muted timeago" title="{messages.timestampISO}"></span>
17
- {{{ if messages.edited }}}
18
- <div class="text-muted ms-auto" title="[[global:edited-timestamp, {messages.editedISO}]]"><i class="fa fa-edit"></i></span></div>
19
- {{{ end }}}
17
+
18
+ <div component="chat/message/edited" class="text-muted ms-auto {{{ if !messages.edited }}}hidden{{{ end }}}" title="[[global:edited-timestamp, {messages.editedISO}]]"><i class="fa fa-edit"></i></span></div>
20
19
  </div>
21
20
  <div class="message-body-wrapper hover-parent">
22
21
  <div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break">
@@ -10,13 +10,17 @@
10
10
  <span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{messages.fromUser.displayname}</a></span>
11
11
 
12
12
  <span class="chat-timestamp text-muted timeago" title="{messages.timestampISO}"></span>
13
+ <div component="chat/message/edited" class="text-muted ms-auto {{{ if !messages.edited }}}hidden{{{ end }}}" title="[[global:edited-timestamp, {messages.editedISO}]]"><i class="fa fa-edit"></i></span></div>
13
14
  </div>
14
15
  <div class="message-body-wrapper hover-parent">
15
16
  <div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break">
16
17
  {messages.content}
17
18
  </div>
18
19
  <div component="chat/message/controls" class="position-relative">
19
- <div class="d-flex border shadow-sm controls position-absolute bg-body hover-d-block end-0" style="bottom:1rem;">
20
+ <div class="btn-group border shadow-sm controls position-absolute bg-body hover-d-block end-0" style="bottom:1rem;">
21
+ {{{ if (isAdminOrGlobalMod || (!config.disableChatMessageEditing && messages.self)) }}}
22
+ <button class="btn btn-sm btn-link" data-action="edit" title="[[topic:edit]]"><i class="fa fa-pencil"></i></button>
23
+ {{{ end }}}
20
24
  {{{ if (isAdminOrGlobalMod || isOwner )}}}
21
25
  <button class="btn btn-sm btn-link" data-action="pin" title="[[modules:chat.pin-message]]"><i class="fa fa-thumbtack"></i></button>
22
26
  <button class="btn btn-sm btn-link" data-action="unpin" title="[[modules:chat.unpin-message]]"><i class="fa fa-thumbtack fa-rotate-90"></i></button>