nodebb-theme-harmony 2.0.0-pre.36 → 2.0.0-pre.38

package/package.json

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

package/public/harmony.js

@@ -72,7 +72,7 @@ $(document).ready(function () {
 				return !!$('[component="bottombar"] [component="sidebar/search"] .search-dropdown.show').length;
 			}
 
-			let lastScrollTop = 0;
+			let lastScrollTop = $window.scrollTop();
 			let newPostsLoaded = false;
 
 			function onWindowScroll() {
@@ -86,7 +86,7 @@ $(document).ready(function () {
 					const diff = Math.abs(st - lastScrollTop);
 					const scrolledDown = st > lastScrollTop;
 					const scrolledUp = st < lastScrollTop;
-					if (diff > 5) {
+					if (diff > 10) {
 						bottomBar.css({
 							bottom: !scrolledUp && scrolledDown ?
 								-bottomBar.find('.bottombar-nav').outerHeight(true) :
@@ -115,8 +115,10 @@ $(document).ready(function () {
 			});
 			hooks.on('action:ajaxify.end', function () {
 				$window.off('scroll', delayedScroll);
-				bottomBar.css({ bottom: 0 });
-				setTimeout(enableAutohide, 250);
+				if (config.theme.autohideBottombar) {
+					bottomBar.css({ bottom: 0 });
+					setTimeout(enableAutohide, 250);
+				}
 			});
 		});
 	}

package/templates/account/edit/password.tpl

@@ -7,22 +7,22 @@
 			<!-- disables autocomplete on FF --><input type="password" style="display:none">
 
 			{{{ if isSelf }}}
-			<div class="mb-2">
-				<label class="form-label fw-semibold text-xm" for="inputCurrentPassword">[[user:current-password]]</label>
+			<div class="mb-3">
+				<label class="form-label fw-semibold text-sm" for="inputCurrentPassword">[[user:current-password]]</label>
 				<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value="" {{{ if !hasPassword }}} disabled{{{ end }}}>
 			</div>
 			{{{ end }}}
 
-			<div class="mb-2">
-				<label class="form-label fw-semibold text-xm" for="inputNewPassword">[[user:new-password]]</label>
+			<div class="mb-3">
+				<label class="form-label fw-semibold text-sm" for="inputNewPassword">[[user:new-password]]</label>
 				<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
-				<span class="form-feedback" id="password-notify"></span>
+				<span class="form-text" id="password-notify"></span>
 			</div>
 
-			<div class="mb-2">
-				<label class="form-label fw-semibold text-xm" for="inputNewPasswordAgain">[[user:confirm-password]]</label>
+			<div class="mb-3">
+				<label class="form-label fw-semibold text-sm" for="inputNewPasswordAgain">[[user:confirm-password]]</label>
 				<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm-password]]" value="">
-				<span class="form-feedback" id="password-confirm-notify"></span>
+				<span class="form-text" id="password-confirm-notify"></span>
 			</div>
 
 			<div class="form-actions">

package/templates/account/edit/username.tpl

@@ -4,7 +4,7 @@
 <div class="row">
 	<div class="col-12 col-lg-4">
 		<form class="edit-form">
-			<div class="mb-2">
+			<div class="mb-3">
 				<label class="form-label fw-semibold text-sm" for="inputNewUsername">[[user:username]]</label>
 				<input class="form-control" type="text" id="inputNewUsername" placeholder="[[user:username]]" value="{username}">
 			</div>
@@ -12,7 +12,7 @@
 			<!-- disables autocomplete on FF --><input type="password" style="display:none">
 
 			{{{ if isSelf }}}
-			<div class="mb-2">
+			<div class="mb-3">
 				<label class="form-label fw-semibold text-sm" for="inputCurrentPassword">[[user:current-password]]</label>
 				<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value=""{{{ if !hasPassword }}} disabled{{{ end }}}>
 			</div>
@@ -20,7 +20,6 @@
 
 			<input type="hidden" name="uid" id="inputUID" value="{uid}" />
 
-			<br/>
 			<div class="form-actions">
 				<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change-username]]</button>
 			</div>

package/templates/account/read.tpl

@@ -0,0 +1 @@
+<!-- IMPORT account/topics.tpl -->

package/templates/account/topics.tpl

@@ -25,6 +25,7 @@
 		<a href="{config.relative_path}/user/{userslug}/topics" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/topics }}}active{{{ end }}}">[[global:header.recent]]</a>
 		<a href="{config.relative_path}/user/{userslug}/watched"class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/watched }}}active{{{ end }}}">[[user:watched]]</a>
 		<a href="{config.relative_path}/user/{userslug}/ignored" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/ignored }}}active{{{ end }}}">[[user:ignored]]</a>
+		<a href="{config.relative_path}/user/{userslug}/read" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/read }}}active{{{ end }}}">[[user:read]]</a>
 		{{{ end }}}
 	</div>
 </div>

package/templates/partials/categories/item.tpl

@@ -16,12 +16,12 @@
 			{{{ end }}}
 			{{{ if !config.hideSubCategories }}}
 			{{{ if ./children.length }}}
-			<div class="category-children row row-cols-2 g-2 my-1 w-100">
+			<div class="category-children row row-cols-1 row-cols-md-2 g-2 my-1 w-100">
 				{{{ each ./children }}}
 				{{{ if !./isSection }}}
 				<span class="category-children-item small">
 					<div class="d-flex align-items-center gap-1">
-						<i class="fa fa-fw fa-caret-right text-primary"></i>
+						<i class="fa fa-fw fa-caret-right text-primary align-self-start" style="line-height: var(--bs-body-line-height);"></i>
 						<a href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" class="text-reset fw-semibold">{./name}</a>
 					</div>
 				</span>

package/templates/partials/tags_list.tpl

@@ -1,6 +1,6 @@
 {{{each tags}}}
 <a href="{config.relative_path}/tags/{./valueEncoded}" data-tag="{./valueEscaped}" class="btn btn-ghost ff-base d-flex flex-column gap-1 align-items-start justify-content-start text-truncate p-2">
 	<div class="fw-semibold text-nowrap tag-item w-100 text-start text-truncate">{./valueEscaped}</div>
-	<div class="text-xs text-muted text-nowrap tag-topic-count">[[global:x-topics, {formattedNumber(./score)}]]</div>
+	<div class="text-xs text-muted text-nowrap tag-topic-count">[[global:x-topics, {txEscape(formattedNumber(./score))}]]</div>
 </a>
 {{{end}}}

package/templates/partials/topic/post.tpl

@@ -86,13 +86,13 @@
 
 	<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 text-muted text-decoration-none text-xs {{{ if (!./replies || shouldHideReplyContainer(@value)) }}}hidden{{{ end }}}">
+		<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="d-flex gap-2 align-items-center mt-2 btn 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}}}
 				{{{ if posts.replies.hasMore}}}
-				<span><i class="fa fa-ellipsis"></i></span>
+				<span style="height: 20px; line-height: 20px;"><i class="fa fa-ellipsis"></i></span>
 				{{{ end }}}
 			</span>
 
@@ -112,7 +112,7 @@
 		<a component="post/quote" href="#" class="btn btn-ghost btn-sm {{{ if !privileges.topics:reply }}}hidden{{{ end }}}" title="[[topic:quote]]"><i class="fa fa-fw fa-quote-right text-primary"></i></a>
 
 		{{{ if ./announces }}}
-		<a component="post/announce-count" href="#" class="btn btn-ghost btn-sm" title="[[activitypub:announcers]]"><i class="fa fa-share-alt text-primary"></i> {./announces}</a>
+		<a component="post/announce-count" href="#" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center" title="[[activitypub:announcers]]"><i class="fa fa-share-alt text-primary"></i> {./announces}</a>
 		{{{ end }}}
 
 		{{{ if !reputation:disabled }}}