nodebb-theme-persona 11.3.33 → 11.3.37

package/less/chats.less

@@ -245,6 +245,7 @@
 		.teaser-timestamp {
 			font-size: 10px;
 			margin-top: 10px;
+			margin-right: 10px;
 		}
 
 		a {

package/less/header.less

@@ -31,6 +31,11 @@
 					display: block;
 					min-height: 32px;
 				}
+				.relTime {
+					font-size: 10px;
+					margin-top: 10px;
+					margin-right: 10px;
+				}
 			}
 
 			.mark-read {

package/less/mobile.less

@@ -179,10 +179,16 @@
 					white-space: nowrap;
 					text-overflow: ellipsis;
 				}
+				.teaser-timestamp {
+					margin-right: 10px;
+				}
 			}
 		}
 
 		.menu-section {
+			.notification-list-mobile li .text {
+				display: block;
+			}
 			.chat-list, .notification-list-mobile {
 				.user-link {
 					display: inline;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "11.3.33",
+  "version": "11.3.37",
   "nbbpm": {
     "compatibility": "^1.18.0"
   },

package/public/persona.js

@@ -45,42 +45,49 @@ $(document).ready(function () {
 		if (!$.fn.autoHidingNavbar) {
 			return;
 		}
-		var env = utils.findBootstrapEnvironment();
-		// if env didn't change don't destroy and recreate
-		if (env === lastBSEnv) {
-			return;
-		}
-		lastBSEnv = env;
-		var navbarEl = $('.navbar-fixed-top');
-		navbarEl.autoHidingNavbar('destroy').removeData('plugin_autoHidingNavbar');
-		navbarEl.css('top', '');
-
-		if (env === 'xs' || env === 'sm') {
-			navbarEl.autoHidingNavbar({
-				showOnBottom: false,
-			});
-		}
 
-		function fixTopCss(topValue) {
-			if (ajaxify.data.template.topic) {
-				$('.topic .topic-header').css({ top: topValue });
-			} else {
-				var topicListHeader = $('.topic-list-header');
-				if (topicListHeader.length) {
-					topicListHeader.css({ top: topValue });
-				}
+		require(['hooks'], (hooks) => {
+			var env = utils.findBootstrapEnvironment();
+			// if env didn't change don't destroy and recreate
+			if (env === lastBSEnv) {
+				return;
 			}
-		}
+			lastBSEnv = env;
+			var navbarEl = $('.navbar-fixed-top');
+			navbarEl.autoHidingNavbar('destroy').removeData('plugin_autoHidingNavbar');
+			navbarEl.css('top', '');
+
+			hooks.fire('filter:persona.configureNavbarHiding', {
+				resizeEnvs: ['xs', 'sm'],
+			}).then(({ resizeEnvs }) => {
+				if (resizeEnvs.includes(env)) {
+					navbarEl.autoHidingNavbar({
+						showOnBottom: false,
+					});
+				}
 
-		navbarEl.off('show.autoHidingNavbar')
-			.on('show.autoHidingNavbar', function () {
-				fixTopCss('');
-			});
+				function fixTopCss(topValue) {
+					if (ajaxify.data.template.topic) {
+						$('.topic .topic-header').css({ top: topValue });
+					} else {
+						var topicListHeader = $('.topic-list-header');
+						if (topicListHeader.length) {
+							topicListHeader.css({ top: topValue });
+						}
+					}
+				}
 
-		navbarEl.off('hide.autoHidingNavbar')
-			.on('hide.autoHidingNavbar', function () {
-				fixTopCss('0px');
+				navbarEl.off('show.autoHidingNavbar')
+					.on('show.autoHidingNavbar', function () {
+						fixTopCss('');
+					});
+
+				navbarEl.off('hide.autoHidingNavbar')
+					.on('hide.autoHidingNavbar', function () {
+						fixTopCss('0px');
+					});
 			});
+		});
 	}
 
 	function setupNProgress() {
@@ -283,15 +290,6 @@ $(document).ready(function () {
 			});
 
 			if (chatMenuVisible) {
-				chatsSlideout.on('opened', function loadNotifications() {
-					require(['notifications'], function (notifications) {
-						const notifList = $('#chats-menu [data-section="notifications"] ul');
-						notifications.loadNotifications(notifList, function () {
-							notifList.find('.deco-none').removeClass('deco-none');
-						});
-					});
-				});
-
 				navSlideout.on('beforeopen', function () {
 					chatsSlideout.close();
 					chatsSlideout.disable();
@@ -314,11 +312,15 @@ $(document).ready(function () {
 				}
 			});
 
-			// right slideout chats menu
+			// right slideout notifications & chats menu
 
-			function loadChats() {
-				require(['chat'], function (chat) {
-					chat.loadChatsDropdown($('#chats-menu .chat-list'));
+			function loadNotificationsAndChats() {
+				require(['notifications', 'chat'], function (notifications, chat) {
+					const notifList = $('#chats-menu [data-section="notifications"] ul');
+					notifications.loadNotifications(notifList, function () {
+						notifList.find('.deco-none').removeClass('deco-none');
+						chat.loadChatsDropdown($('#chats-menu .chat-list'));
+					});
 				});
 			}
 
@@ -332,7 +334,7 @@ $(document).ready(function () {
 				});
 
 				chatsSlideout
-					.on('opened', loadChats)
+					.on('opened', loadNotificationsAndChats)
 					.on('beforeopen', function () {
 						navSlideout.close().disable();
 					})

package/templates/partials/topic/quickreply.tpl

@@ -12,7 +12,7 @@
 		<input type="hidden" name="tid" value="{tid}" />
 		<input type="hidden" name="_csrf" value="{config.csrf_token}" />
 		<div class="quickreply-message">
-			<textarea name="content" component="topic/quickreply/text" class="form-control" rows="5"></textarea>
+			<textarea name="content" component="topic/quickreply/text" class="form-control" rows="5" placeholder="[[modules:composer.textarea.placeholder]]"></textarea>
 			<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
 		</div>
 		<button type="submit" component="topic/quickreply/button" class="btn btn-primary pull-right">[[topic:post-quick-reply]]</button>

package/templates/topic.tpl

@@ -36,7 +36,11 @@
 				{{{ if !feeds:disableRSS }}}
 				{{{ if rssFeedUrl }}}<a class="hidden-xs" target="_blank" href="{rssFeedUrl}"><i class="fa fa-rss-square"></i></a>{{{ end }}}
 				{{{ end }}}
+				{{{ if browsingUsers }}}
+				<div class="inline-block hidden-xs">
 				<!-- IMPORT partials/topic/browsing-users.tpl -->
+				</div>
+				{{{ end }}}
 
 				<!-- IMPORT partials/post_bar.tpl -->
 			</div>
@@ -71,6 +75,13 @@
 			{{{end}}}
 		</ul>
 
+		{{{ if browsingUsers }}}
+		<div class="visible-xs">
+			<!-- IMPORT partials/topic/browsing-users.tpl -->
+			<hr/>
+		</div>
+		{{{ end }}}
+
 		<!-- IF config.enableQuickReply -->
 		<!-- IMPORT partials/topic/quickreply.tpl -->
 		<!-- ENDIF config.enableQuickReply -->

package/templates/partials/topic/browsing-users.tpl

@@ -1,13 +0,0 @@
-<div component="topic/browsing-users" class="inline-block hidden-xs">
-	{{{each browsingUsers}}}
-	<div class="pull-left" data-uid="{browsingUsers.uid}">
-		<a href="<!-- IF browsingUsers.userslug -->{config.relative_path}/user/{browsingUsers.userslug}<!-- ELSE -->#<!-- ENDIF browsingUsers.userslug -->">
-			<!-- IF browsingUsers.picture -->
-			<img class="avatar avatar-sm avatar-rounded" component="user/picture" src="{browsingUsers.picture}" align="left" itemprop="image" title="{browsingUsers.username}"/>
-			<!-- ELSE -->
-			<div class="avatar avatar-sm avatar-rounded" component="user/picture" title="{browsingUsers.username}" style="background-color: {browsingUsers.icon:bgColor};">{browsingUsers.icon:text}</div>
-			<!-- ENDIF browsingUsers.picture -->
-		</a>
-	</div>
-	{{{end}}}
-</div>