nodebb-theme-harmony 2.0.0-pre.24 → 2.0.0-pre.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "2.0.0-pre.24",
+  "version": "2.0.0-pre.25",
   "nbbpm": {
     "compatibility": "^3.7.0"
   },

package/templates/account/info.tpl

@@ -198,7 +198,7 @@
 						<p class="mb-1">
 							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
 						</p>
-						<p class="">
+						<p>
 							{{{ if ./until }}}
 							<span class="expiry">[[user:info.banned-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]]</span>
 							{{{ else }}}
@@ -252,7 +252,7 @@
 						<p class="mb-1">
 							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
 						</p>
-						<p class="">
+						<p>
 							{{{ if ./until }}}
 							<span class="expiry">[[user:info.muted-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]]</span>
 							{{{ end }}}

package/templates/account/posts.tpl

@@ -24,7 +24,7 @@
 <div class="alert alert-warning text-center">{noItemsFoundKey}</div>
 {{{ end }}}
 
-<div class="">
+<div>
 	<!-- IMPORT partials/posts_list.tpl -->
 
 	{{{ if config.usePagination }}}

package/templates/account/settings.tpl

@@ -100,7 +100,7 @@
 			<label class="form-label text-sm" for="topicsPerPage">[[user:topics-per-page]] ([[user:max-items-per-page, {maxTopicsPerPage}]])</label>
 			<input type="text" class="form-control form-control-sm" id="topicsPerPage" data-property="topicsPerPage" value="{settings.topicsPerPage}">
 		</div>
-		<div class="">
+		<div>
 			<label class="form-label text-sm" for="postsPerPage">[[user:posts-per-page]] ([[user:max-items-per-page, {maxPostsPerPage}]])</label>
 			<input type="text" class="form-control form-control-sm" id="postsPerPage" data-property="postsPerPage" value="{settings.postsPerPage}">
 		</div>
@@ -119,7 +119,7 @@
 				<option value="most_views" {{{ if (settings.categoryTopicSort == "most_views") }}}selected{{{ end }}}>[[topic:most-views]]</option>
 			</select>
 		</div>
-		<div class="">
+		<div>
 			<label class="form-label text-sm" for="topicPostSort">[[user:topic-post-sort]]</label>
 			<select class="form-select form-select-sm" id="topicPostSort" data-property="topicPostSort">
 				<option value="oldest_to_newest" {{{ if (settings.topicPostSort == "oldest_to_newest") }}}selected{{{ end }}}>[[topic:oldest-to-newest]]</option>
@@ -132,7 +132,7 @@
 		{{{ if !disableEmailSubscriptions }}}
 		<hr/>
 		<h6 class="fw-bold">[[global:email]]</h6>
-		<div class="">
+		<div>
 			<div class="mb-2">
 				<label class="form-label text-sm" for="dailyDigestFreq">[[user:digest-label]]</label>
 				<select class="form-select form-select-sm" id="dailyDigestFreq" data-property="dailyDigestFreq" autocomplete="off">
@@ -148,7 +148,7 @@
 		{{{ each customSettings}}}
 		<hr/>
 		<h6 class="fw-bold">{./title}</h6>
-		<div class="">
+		<div>
 			{./content}
 		</div>
 		{{{end}}}
@@ -177,7 +177,7 @@
 		{{{ end }}}
 
 		<h6 class="fw-bold">[[topic:watch]]</h6>
-		<div class="">
+		<div>
 			<div class="form-check form-switch">
 				<input class="form-check-input" type="checkbox" role="switch" id="followTopicsOnCreate" data-property="followTopicsOnCreate" {{{ if settings.followTopicsOnCreate }}}checked{{{ end }}}/>
 				<label class="form-check-label text-sm" for="followTopicsOnCreate">[[user:follow-topics-you-create]]</label>

package/templates/footer.tpl

@@ -5,7 +5,7 @@
 	</div>
 	<!-- IMPORT partials/mobile-footer.tpl -->
 	{{{ if !isSpider }}}
-	<div class="">
+	<div>
 		<div component="toaster/tray" class="alert-window fixed-bottom mb-5 mb-md-2 me-2 me-md-5 ms-auto" style="width:300px; z-index: 1090;">
 			<!-- IMPORT partials/reconnect-alert.tpl -->
 		</div>

package/templates/groups/list.tpl

@@ -16,9 +16,9 @@
 				</div>
 			</div>
 		</div>
-		<div class="">
+		<div>
 			<div class="d-flex justify-content-end gap-2">
-				<div class="">
+				<div>
 					{{{ if allowGroupCreation }}}
 					<button class="btn btn-primary btn-sm text-nowrap" data-action="new"><i class="fa fa-users"></i> [[groups:new-group]]</button>
 					{{{ end }}}
@@ -28,7 +28,7 @@
 						<option value="date">[[groups:details.creation-date]]</option>
 					</select>
 				</div>
-				<div class="">
+				<div>
 					<div class="input-group">
 						<input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" name="query" id="search-text">
 						<button id="search-button" class="btn btn-primary btn-sm" aria-label="[[global:search]]">

package/templates/partials/breadcrumbs-json-ld.tpl

@@ -1,26 +1,16 @@
-<script type="application/ld+json">
-{
-	"@context": "https://schema.org",
-	"@type": "BreadcrumbList",
-	"itemListElement": [
-		{
-			"@type": "ListItem",
-			"position": 1,
-			"name": "{config.siteTitle}",
-			"item": "{breadcrumbs.0.url}"
-		}
-		{{{ each breadcrumbs }}}
-		{{{ if !@first}}}
-		,{
-			"@type": "ListItem",
-			"position": {increment(@index, "1")},
-			"name": "{stripTags(./text)}"
-			{{{ if !@last }}}
-			,"item": "{./url}"
-			{{{ end }}}
-		}
-		{{{ end }}}
-		{{{ end }}}
-	]
+<script type="application/ld+json">{
+"@context": "https://schema.org",
+"@type": "BreadcrumbList",
+"itemListElement": [{
+	"@type": "ListItem",
+	"position": 1,
+	"name": "{config.siteTitle}",
+	"item": "{breadcrumbs.0.url}"
 }
-</script>
+{{{ each breadcrumbs }}}{{{ if !@first}}},{
+	"@type": "ListItem",
+	"position": {increment(@index, "1")},
+	"name": "{stripTags(./text)}"
+	{{{ if !@last }}},"item": "{./url}"{{{ end }}}
+}{{{ end }}}{{{ end }}}
+]}</script>

package/templates/partials/groups/memberlist.tpl

@@ -4,7 +4,7 @@
 		<button component="groups/members/add" type="button" class="btn btn-primary btn-sm me-3" title="[[groups:details.add-member]]"><i class="fa fa-user-plus"></i> [[groups:details.add-member]]</button>
 	</div>
 	{{{ end }}}
-	<div class="">
+	<div>
 		<div class="input-group">
 			<input class="form-control form-control-sm" type="text" component="groups/members/search" placeholder="[[global:search]]"/>
 			<button class="btn btn-primary btn-sm search-button" type="button">

package/templates/partials/mobile-footer.tpl

@@ -15,16 +15,13 @@
 					{{{ each navigation }}}
 					{{{ if displayMenuItem(@root, @index) }}}
 					<li class="nav-item {./class}{{{ if ./dropdown }}} dropend{{{ end }}}" title="{./title}">
-						<a class="nav-link navigation-link px-3 py-2 {{{ if ./dropdown }}}dropdown-toggle{{{ end }}}"
-						{{{ if ./dropdown }}} href="#" role="button" data-bs-toggle="collapse" data-bs-target="#collapse-target-{@index}" onclick="event.stopPropagation();" {{{ else }}} href="{./route}"{{{ end }}} {{{ if ./id }}}id="{./id}"{{{ end }}}{{{ if ./targetBlank }}} target="_blank"{{{ end }}}>
+						<a class="nav-link navigation-link px-3 py-2 {{{ if ./dropdown }}}dropdown-toggle{{{ end }}}" {{{ if ./dropdown }}} href="#" role="button" data-bs-toggle="collapse" data-bs-target="#collapse-target-{@index}" onclick="event.stopPropagation();" {{{ else }}} href="{./route}"{{{ end }}} {{{ if ./id }}}id="{./id}"{{{ end }}}{{{ if ./targetBlank }}} target="_blank"{{{ end }}}>
 							<span class="d-inline-flex justify-content-between align-items-center w-100">
 								<span class="text-nowrap">
 									{{{ if ./iconClass }}}
 									<i class="fa fa-fw {./iconClass}" data-content="{./content}"></i>
 									{{{ end }}}
-									{{{ if ./text }}}
-									<span class="nav-text px-2 fw-semibold">{./text}</span>
-									{{{ end }}}
+									{{{ if ./text }}}<span class="nav-text px-2 fw-semibold">{./text}</span>{{{ end }}}
 								</span>
 								<span component="navigation/count" class="badge rounded-1 bg-primary {{{ if !./content }}}hidden{{{ end }}}">{./content}</span>
 							</span>

package/templates/partials/post_bar.tpl

@@ -18,9 +18,7 @@
 				{{{ end }}}
 
 				{{{ if browsingUsers }}}
-				<div class="hidden-xs">
-				<!-- IMPORT partials/topic/browsing-users.tpl -->
-				</div>
+				<div class="hidden-xs"><!-- IMPORT partials/topic/browsing-users.tpl --></div>
 				{{{ end }}}
 			</div>
 			<!-- IMPORT partials/topic/reply-button.tpl -->

package/templates/partials/sidebar-left.tpl

@@ -3,8 +3,7 @@
 		{{{ each navigation }}}
 		{{{ if displayMenuItem(@root, @index) }}}
 		<li class="nav-item mx-2 {./class}{{{ if ./dropdown }}} dropend{{{ end }}}" title="{./title}">
-			<a class="nav-link navigation-link d-flex gap-2 justify-content-between align-items-center {{{ if ./dropdown }}}dropdown-toggle{{{ end }}}"
-			{{{ if ./dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{./route}"{{{ end }}} {{{ if ./id }}}id="{./id}"{{{ end }}}{{{ if ./targetBlank }}} target="_blank"{{{ end }}} {{{ if ./text }}}aria-label="{./text}"{{{ end }}}>
+			<a class="nav-link navigation-link d-flex gap-2 justify-content-between align-items-center {{{ if ./dropdown }}}dropdown-toggle{{{ end }}}" {{{ if ./dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{./route}"{{{ end }}} {{{ if ./id }}}id="{./id}"{{{ end }}}{{{ if ./targetBlank }}} target="_blank"{{{ end }}} {{{ if ./text }}}aria-label="{./text}"{{{ end }}}>
 				<span class="d-flex gap-2 align-items-center text-nowrap truncate-open">
 					<span class="position-relative">
 						{{{ if ./iconClass }}}
@@ -12,9 +11,7 @@
 						<span component="navigation/count" class="visible-closed position-absolute top-0 start-100 translate-middle badge rounded-1 bg-primary {{{ if !./content }}}hidden{{{ end }}}">{./content}</span>
 						{{{ end }}}
 					</span>
-					{{{ if ./text }}}
-					<span class="nav-text small visible-open fw-semibold text-truncate">{./text}</span>
-					{{{ end }}}
+					{{{ if ./text }}}<span class="nav-text small visible-open fw-semibold text-truncate">{./text}</span>{{{ end }}}
 				</span>
 				<span component="navigation/count" class="visible-open badge rounded-1 bg-primary {{{ if !./content }}}hidden{{{ end }}}">{./content}</span>
 			</a>

package/templates/partials/topic/post-menu.tpl

@@ -1,30 +1,4 @@
-<span component="post/tools" class="dropdown moderator-tools bottom-sheet d-inline-block {{{ if !./display_post_menu }}}hidden{{{ end }}}">
-	<a class="btn-ghost-sm ff-secondary dropdown-toggle d-block" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[topic:post-tools]]"><i class="fa fa-fw fa-ellipsis-v text-primary"></i></a>
-	<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu">
-		<li class="dropdown-item placeholder-wave">
-			<div class="placeholder" style="width: 20px;"></div>
-			<div class="placeholder col-3"></div>
-		</li>
-		<li class="dropdown-item placeholder-wave">
-			<div class="placeholder" style="width: 20px;"></div>
-			<div class="placeholder col-5"></div>
-		</li>
-		<li class="dropdown-item placeholder-wave">
-			<div class="placeholder" style="width: 20px;"></div>
-			<div class="placeholder col-9"></div>
-		</li>
-		<li class="dropdown-item placeholder-wave">
-			<div class="placeholder" style="width: 20px;"></div>
-			<div class="placeholder col-7"></div>
-		</li>
-		<li class="dropdown-item placeholder-wave">
-			<div class="placeholder" style="width: 20px;"></div>
-			<div class="placeholder col-10"></div>
-		</li>
-		<li class="dropdown-divider"></li>
-		<li class="dropdown-item placeholder-wave">
-			<div class="placeholder" style="width: 20px;"></div>
-			<div class="placeholder col-10"></div>
-		</li>
-	</ul>
+<span component="post/tools" class="dropdown bottom-sheet {{{ if !./display_post_menu }}}hidden{{{ end }}}">
+	<a class="btn-ghost-sm ff-secondary dropdown-toggle" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[topic:post-tools]]"><i class="fa fa-fw fa-ellipsis-v text-primary"></i></a>
+	<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu"></ul>
 </span>

package/templates/partials/topic/post.tpl

@@ -5,30 +5,26 @@
 	{{{ end }}}
 </div>
 {{{ end }}}
-
 <div class="d-flex align-items-start gap-3">
-	<div class="icon bg-body d-none d-sm-block rounded-circle" style="outline: 2px solid var(--bs-body-bg);">
-		<a class="d-inline-block position-relative text-decoration-none" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
+	<div class="bg-body d-none d-sm-block rounded-circle" style="outline: 2px solid var(--bs-body-bg);">
+		<a class="d-inline-block position-relative text-decoration-none" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" aria-label="[[aria:user-avatar-for, {./user.username}]]">
 			{buildAvatar(posts.user, "48px", true, "", "user/picture")}
 			<span component="user/status" class="position-absolute translate-middle-y border border-white border-2 rounded-circle status {posts.user.status}"><span class="visually-hidden">[[global:{posts.user.status}]]</span></span>
 		</a>
 	</div>
-
-	<div class="post-container d-flex flex-grow-1 flex-column w-100" style="min-width: 0;">
+	<div class="post-container d-flex flex-grow-1 flex-column w-100" style="min-width:0;">
 		<div class="d-flex align-items-center gap-1 flex-wrap w-100 post-header mt-1" itemprop="author" itemscope itemtype="https://schema.org/Person">
 			<meta itemprop="name" content="{./user.username}">
 			{{{ if ./user.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{./user.userslug}">{{{ end }}}
 
-			<div class="icon bg-body d-sm-none">
+			<div class="bg-body d-sm-none">
 				<a class="d-inline-block position-relative text-decoration-none" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
 					{buildAvatar(posts.user, "20px", true, "", "user/picture")}
 					<span component="user/status" class="position-absolute translate-middle-y border border-white border-2 rounded-circle status {posts.user.status}"><span class="visually-hidden">[[global:{posts.user.status}]]</span></span>
 				</a>
 			</div>
 
-			<span class="text-nowrap">
-				<a class="fw-bold" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.displayname}</a>
-			</span>
+			<a class="fw-bold text-nowrap" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.displayname}</a>
 
 			{{{ each posts.user.selectedGroups }}}
 			{{{ if posts.user.selectedGroups.slug }}}
@@ -41,28 +37,22 @@
 			{{{ end }}}
 
 			<div class="d-flex gap-1 align-items-center">
-				<span class="text-muted">
-					{{{ if posts.toPid }}}
-					{generateRepliedTo(@value, config.timeagoCutoff)}
-					{{{ else }}}
-					{generateWrote(@value, config.timeagoCutoff)}
-					{{{ end }}}
-				</span>
+				<span class="text-muted">{generateWroteReplied(@value, config.timeagoCutoff)}</span>
 
 				<i component="post/edit-indicator" class="fa fa-edit text-muted{{{ if privileges.posts:history }}} pointer{{{ end }}} edit-icon {{{ if !posts.editor.username }}}hidden{{{ end }}}" title="[[global:edited-timestamp, {isoTimeToLocaleString(./editedISO, config.userLang)}]]"></i>
 				<span data-editor="{posts.editor.userslug}" component="post/editor" class="visually-hidden">[[global:last-edited-by, {posts.editor.username}]] <span class="timeago" title="{isoTimeToLocaleString(posts.editedISO, config.userLang)}"></span></span>
 			</div>
 
+			{{{ if posts.user.custom_profile_info.length }}}
 			<div>
 				<span>
-					{{{ if posts.user.custom_profile_info.length }}}
 					&#124;
 					{{{ each posts.user.custom_profile_info }}}
 					{posts.user.custom_profile_info.content}
 					{{{ end }}}
-					{{{ end }}}
 				</span>
 			</div>
+			{{{ end }}}
 			<div class="d-flex align-items-center gap-1 flex-grow-1 justify-content-end">
 				<span class="bookmarked opacity-0 text-primary"><i class="fa fa-bookmark-o"></i></span>
 				<a href="{config.relative_path}/post/{encodeURIComponent(./pid)}" class="post-index text-muted d-none d-md-inline">#{increment(./index, "1")}</a>
@@ -82,8 +72,8 @@
 
 	<div class="d-flex">
 		{{{ if !hideReplies }}}
-		<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="d-flex gap-2 align-items-center mt-2 btn-ghost ff-secondary border rounded-1 p-1 threaded-replies user-select-none text-muted text-decoration-none text-xs {{{ if (!./replies || shouldHideReplyContainer(@value)) }}}hidden{{{ end }}}">
-			<span component="post/reply-count/avatars" class="avatars d-inline-flex gap-1 align-items-top {{{ if posts.replies.hasMore }}}hasMore{{{ end }}}">
+		<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="d-flex gap-2 align-items-center mt-2 btn-ghost ff-secondary border rounded-1 p-1 text-muted text-decoration-none text-xs {{{ if (!./replies || shouldHideReplyContainer(@value)) }}}hidden{{{ end }}}">
+			<span component="post/reply-count/avatars" class="d-flex gap-1 {{{ if posts.replies.hasMore }}}hasMore{{{ end }}}">
 				{{{each posts.replies.users}}}
 				<span>{buildAvatar(posts.replies.users, "20px", true, "avatar-tooltip")}</span>
 				{{{end}}}
@@ -96,8 +86,6 @@
 			<span class="ms-2 replies-last hidden-xs fw-semibold">[[topic:last-reply-time]] <span class="timeago" title="{posts.replies.timestampISO}"></span></span>
 
 			<i class="fa fa-fw fa-chevron-down" component="post/replies/open"></i>
-			<i class="fa fa-fw fa-chevron-up hidden" component="post/replies/close"></i>
-			<i class="fa fa-fw fa-spin fa-spinner hidden" component="post/replies/loading"></i>
 		</a>
 		{{{ end }}}
 	</div>
@@ -106,8 +94,8 @@
 
 	<div component="post/actions" class="d-flex justify-content-end gap-1 post-tools">
 		<!-- IMPORT partials/topic/reactions.tpl -->
-		<a component="post/reply" href="#" class="btn-ghost-sm user-select-none {{{ if !privileges.topics:reply }}}hidden{{{ end }}}" title="[[topic:reply]]"><i class="fa fa-fw fa-reply text-primary"></i></a>
-		<a component="post/quote" href="#" class="btn-ghost-sm user-select-none {{{ if !privileges.topics:reply }}}hidden{{{ end }}}" title="[[topic:quote]]"><i class="fa fa-fw fa-quote-right text-primary"></i></a>
+		<a component="post/reply" href="#" class="btn-ghost-sm {{{ if !privileges.topics:reply }}}hidden{{{ end }}}" title="[[topic:reply]]"><i class="fa fa-fw fa-reply text-primary"></i></a>
+		<a component="post/quote" href="#" class="btn-ghost-sm {{{ if !privileges.topics:reply }}}hidden{{{ end }}}" title="[[topic:quote]]"><i class="fa fa-fw fa-quote-right text-primary"></i></a>
 
 		{{{ if !reputation:disabled }}}
 		<div class="d-flex votes align-items-center">
@@ -130,7 +118,6 @@
 		<!-- IMPORT partials/topic/post-menu.tpl -->
 	</div>
 </div>
-
 {{{ if (!./index && widgets.mainpost-footer.length) }}}
 <div data-widget-area="mainpost-footer">
 	{{{ each widgets.mainpost-footer }}}

package/templates/partials/topic/reply-button.tpl

@@ -1,5 +1,6 @@
-<div component="topic/reply/container" class="btn-group action-bar {{{ if !privileges.topics:reply }}}hidden{{{ end }}}">
-	<a href="{config.relative_path}/compose?tid={tid}" class="d-flex align-items-center btn btn-sm btn-primary px-3 fw-semibold " component="topic/reply" data-ajaxify="false" role="button"><i class="fa fa-reply d-sm-block d-md-none"></i><span class="d-none d-md-block"> [[topic:reply]]</span></a>
+{{{ if privileges.topics:reply }}}
+<div component="topic/reply/container" class="btn-group">
+	<a href="{config.relative_path}/compose?tid={tid}" class="d-flex align-items-center btn btn-sm btn-primary px-3 fw-semibold" component="topic/reply" data-ajaxify="false" role="button"><i class="fa fa-reply d-sm-block d-md-none"></i><span class="d-none d-md-block"> [[topic:reply]]</span></a>
 	<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[topic:reply-options]]">
 		<span class="caret"></span>
 	</button>
@@ -7,6 +8,7 @@
 		<li><a class="dropdown-item rounded-1" href="#" component="topic/reply-as-topic" role="menuitem">[[topic:reply-as-topic]]</a></li>
 	</ul>
 </div>
+{{{ end }}}
 
 {{{ if loggedIn }}}
 	{{{ if !privileges.topics:reply }}}

package/templates/partials/topic/tools.tpl

@@ -4,10 +4,6 @@
 		<i class="fa fa-fw fa-gear text-primary"></i>
 		<span class="d-none d-md-inline fw-semibold">[[topic:thread-tools.title]]</span>
 	</button>
-	<ul class="dropdown-menu p-1 text-sm" role="menu">
-		<li class="placeholder-wave"><a class="dropdown-item d-flex gap-2" href="#"><div class="placeholder bg-secondary rounded-1" style="width: 1em;"></div><div class="placeholder bg-secondary rounded-1 col-8"></div></a></li>
-		<li class="placeholder-wave"><a class="dropdown-item d-flex gap-2" href="#"><div class="placeholder bg-secondary rounded-1" style="width: 1em;"></div><div class="placeholder bg-secondary rounded-1 col-8"></div></a></li>
-		<li class="placeholder-wave"><a class="dropdown-item d-flex gap-2" href="#"><div class="placeholder bg-secondary rounded-1" style="width: 1em;"></div><div class="placeholder bg-secondary rounded-1 col-8"></div></a></li>
-	</ul>
+	<ul class="dropdown-menu p-1 text-sm" role="menu"></ul>
 </div>
 {{{ end }}}

package/templates/topic.tpl

@@ -4,9 +4,9 @@
 {{{ end }}}
 {{{ if widgets.header.length }}}
 <div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
+{{{each widgets.header}}}
+{{widgets.header.html}}
+{{{end}}}
 </div>
 {{{ end }}}
 
@@ -27,28 +27,22 @@
 			<div class="topic-info d-flex gap-2 align-items-center flex-wrap {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}">
 				<span component="topic/labels" class="d-flex gap-2 {{{ if (!scheduled && (!pinned && (!locked && (!oldCid && !icons.length)))) }}}hidden{{{ end }}}">
 					<span component="topic/scheduled" class="badge badge border border-gray-300 text-body {{{ if !scheduled }}}hidden{{{ end }}}">
-						<i class="fa fa-clock-o"></i>
-						[[topic:scheduled]]
+						<i class="fa fa-clock-o"></i> [[topic:scheduled]]
 					</span>
 					<span component="topic/pinned" class="badge badge border border-gray-300 text-body {{{ if (scheduled || !pinned) }}}hidden{{{ end }}}">
-						<i class="fa fa-thumb-tack"></i>
-						{{{ if !pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {isoTimeToLocaleString(./pinExpiryISO, config.userLang)}]]{{{ end }}}
+						<i class="fa fa-thumb-tack"></i> {{{ if !pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {isoTimeToLocaleString(./pinExpiryISO, config.userLang)}]]{{{ end }}}
 					</span>
 					<span component="topic/locked" class="badge badge border border-gray-300 text-body {{{ if !locked }}}hidden{{{ end }}}">
-						<i class="fa fa-lock"></i>
-						[[topic:locked]]
+						<i class="fa fa-lock"></i> [[topic:locked]]
 					</span>
 					<a component="topic/moved" href="{config.relative_path}/category/{oldCid}" class="badge badge border border-gray-300 text-body text-decoration-none {{{ if !oldCid }}}hidden{{{ end }}}">
-						<i class="fa fa-arrow-circle-right"></i>
-						{{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
+						<i class="fa fa-arrow-circle-right"></i> {{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
 					</a>
 					{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
 				</span>
 				{function.buildCategoryLabel, category, "a", "border"}
 				<div data-tid="{./tid}" component="topic/tags" class="lh-1 tags tag-list d-flex flex-wrap hidden-xs hidden-empty gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>
-				<div class="d-flex hidden-xs gap-2">
-					<!-- IMPORT partials/topic/stats.tpl -->
-				</div>
+				<div class="d-flex hidden-xs gap-2"><!-- IMPORT partials/topic/stats.tpl --></div>
 			</div>
 		</div>
 		<div class="d-flex gap-2 justify-content-end align-items-center mt-2 hidden-empty" component="topic/thumb/list"><!-- IMPORT partials/topic/thumbs.tpl --></div>
@@ -57,15 +51,12 @@
 	<div class="row mb-4 mb-lg-0">
 		<div class="topic {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
 			<!-- IMPORT partials/post_bar.tpl -->
-
 			{{{ if merger }}}
 			<!-- IMPORT partials/topic/merged-message.tpl -->
 			{{{ end }}}
-
 			{{{ if forker }}}
 			<!-- IMPORT partials/topic/forked-message.tpl -->
 			{{{ end }}}
-
 			{{{ if !scheduled }}}
 			<!-- IMPORT partials/topic/deleted-message.tpl -->
 			{{{ end }}}
@@ -76,7 +67,6 @@
 					{{{ each posts }}}
 						<li component="post" class="pt-4 {{{ if posts.deleted }}}deleted{{{ end }}} {{{ if posts.selfPost }}}self-post{{{ end }}} {{{ if posts.topicOwnerPost }}}topic-owner-post{{{ end }}}" <!-- IMPORT partials/data/topic.tpl -->>
 							<a component="post/anchor" data-index="{./index}" id="{increment(./index, "1")}"></a>
-
 							<meta itemprop="datePublished" content="{./timestampISO}">
 							{{{ if ./editedISO }}}
 							<meta itemprop="dateModified" content="{./editedISO}">
@@ -85,9 +75,7 @@
 							<!-- IMPORT partials/topic/post.tpl -->
 						</li>
 						{{{ if (config.topicPostSort != "most_votes") }}}
-						{{{ each ./events}}}
-						<!-- IMPORT partials/topic/event.tpl -->
-						{{{ end }}}
+						{{{ each ./events}}}<!-- IMPORT partials/topic/event.tpl -->{{{ end }}}
 						{{{ end }}}
 					{{{ end }}}
 					</ul>
@@ -110,17 +98,17 @@
 			{{{ end }}}
 		</div>
 		<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 {{{ if !widgets.sidebar.length }}}hidden{{{ end }}}">
-			{{{each widgets.sidebar}}}
-			{{widgets.sidebar.html}}
-			{{{end}}}
+		{{{each widgets.sidebar}}}
+		{{widgets.sidebar.html}}
+		{{{end}}}
 		</div>
 	</div>
 </div>
 
 <div data-widget-area="footer">
-	{{{each widgets.footer}}}
-	{{widgets.footer.html}}
-	{{{end}}}
+{{{each widgets.footer}}}
+{{widgets.footer.html}}
+{{{end}}}
 </div>
 
 {{{ if !config.usePagination }}}

package/templates/users.tpl

@@ -9,7 +9,7 @@
 		<div class="mb-2 mb-md-0">
 		<!-- IMPORT partials/users_list_menu.tpl -->
 		</div>
-		<div class="">
+		<div>
 			<div class="d-flex justify-content-end gap-2">
 				{{{ if showInviteButton }}}
 				<button component="user/invite" class="btn btn-primary btn-sm text-nowrap"><i class="fa fa-user-plus"></i> [[users:invite]]</button>