nodebb-theme-persona 11.2.20 → 11.3.1

package/package.json

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

package/public/persona.js

@@ -23,11 +23,23 @@ $(document).ready(function () {
 
 	function fixHeaderPadding() {
 		var env = utils.findBootstrapEnvironment();
-		if (env === 'sm' || env === 'xs' || env === 'md') {
-			$('#panel').css('padding-top', $('#header-menu').outerHeight(true));
-		} else {
-			$('#panel').css('padding-top', $('#header-menu').outerHeight(true) - 70);
+		const headerEl = document.getElementById('header-menu');
+		const panelEl = document.getElementById('panel');
+
+		if (!headerEl || !panelEl) {
+			return;
+		}
+
+		const headerRect = headerEl.getBoundingClientRect();
+		const headerStyle = window.getComputedStyle(headerEl);
+
+		let paddingTop = headerRect.y + headerRect.height + (parseInt(headerStyle.marginTop, 10) || 0) + (parseInt(headerStyle.marginBottom, 10) || 0);
+		// body element itself introduces a hardcoded 70px padding on desktop resolution
+		if (env === 'lg') {
+			paddingTop -= 70;
 		}
+
+		panelEl.style.paddingTop = `${paddingTop}px`;
 	}
 
 	var lastBSEnv = '';

package/templates/partials/menu.tpl

@@ -202,16 +202,24 @@
 				<ul id="main-nav" class="nav navbar-nav">
 					{{{each navigation}}}
 					<!-- IF function.displayMenuItem, @index -->
-					<li class="{navigation.class}">
-						<a class="navigation-link" href="{navigation.route}" title="{navigation.title}" <!-- IF navigation.id -->id="{navigation.id}"<!-- ENDIF navigation.id --><!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
-							<!-- IF navigation.iconClass -->
+					<li class="{navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}">
+						<a title="{navigation.title}" class="navigation-link {{{ if navigation.dropdown }}}dropdown-toggle{{{ end }}}"
+						{{{ if navigation.dropdown }}} href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{navigation.route}"{{{ end }}} {{{ if navigation.id }}}id="{navigation.id}"{{{ end }}}{{{ if navigation.properties.targetBlank }}} target="_blank"{{{ end }}}>
+							{{{ if navigation.iconClass }}}
 							<i class="fa fa-fw {navigation.iconClass}" data-content="{navigation.content}"></i>
-							<!-- ENDIF navigation.iconClass -->
-
-							<!-- IF navigation.text -->
+							{{{ end }}}
+							{{{ if navigation.text }}}
 							<span class="{navigation.textClass}">{navigation.text}</span>
-							<!-- ENDIF navigation.text -->
+							{{{ end }}}
+							{{{ if navigation.dropdown}}}
+							<i class="fa fa-caret-down"></i>
+							{{{ end }}}
 						</a>
+						{{{ if navigation.dropdown }}}
+						<ul class="dropdown-menu">
+							{navigation.dropdownContent}
+						</ul>
+						{{{ end }}}
 					</li>
 					<!-- ENDIF function.displayMenuItem -->
 					{{{end}}}

package/templates/topic.tpl

@@ -67,7 +67,7 @@
 
 					<!-- IMPORT partials/topic/post.tpl -->
 				</li>
-				{renderTopicEvents(@index)}
+				{renderTopicEvents(@index, config.topicPostSort)}
 			{{{end}}}
 		</ul>