nodebb-theme-harmony 2.0.13 → 2.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "nbbpm": {
     "compatibility": "^3.7.0"
   },

package/scss/mixins.scss

@@ -55,7 +55,7 @@
 			}
 		}
 
-		> div:first-of-type {
+		>.post-container-parent {
 			margin-left: -1.5rem;
 		}
 

package/scss/topic.scss

@@ -69,6 +69,13 @@ body.template-topic {
 		@include topic-avatars();
 	}
 
+	[component="post/parent"] {
+		margin-left: 2.5rem;
+		[component="post/parent/content"] > p:last-child {
+			margin-bottom: 0;
+		}
+	}
+
 	[component="post/replies/container"] {
 		.icon {
 			display: none !important;

package/templates/partials/topic/post.tpl

@@ -5,7 +5,10 @@
 	{{{ end }}}
 </div>
 {{{ end }}}
-<div class="d-flex align-items-start gap-3">
+{{{ if (./parent && !hideParent) }}}
+<!-- IMPORT partials/topic/post-parent.tpl -->
+{{{ end }}}
+<div class="d-flex align-items-start gap-3 post-container-parent">
 	<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:profile-page-for, {./user.displayname}]]">
 			{buildAvatar(posts.user, "48px", true, "", "user/picture")}
@@ -54,7 +57,7 @@
 				{{{ end }}}
 
 				<div class="d-flex gap-1 align-items-center">
-					<span class="text-muted">{generateWroteReplied(@value, config.timeagoCutoff)}</span>
+					<span class="text-muted">{generateWrote(@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>

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

@@ -9,15 +9,9 @@
 </div>
 
 {{{ if loggedIn }}}
-	{{{ if (!privileges.topics:reply && locked) }}}
-	<a href="#" component="topic/reply/locked" class="d-flex gap-2 align-items-center fw-semibold btn btn-sm btn-primary disabled" disabled><i class="fa fa-fw fa-lock"></i> [[topic:locked]]</a>
-	{{{ end }}}
-
-	{{{ if !locked }}}
-	<a href="#" component="topic/reply/locked" class="d-flex gap-2 align-items-center fw-semibold btn btn-sm btn-primary disabled hidden" disabled><i class="fa fa-fw fa-lock"></i> [[topic:locked]]</a>
-	{{{ end }}}
+	<a href="#" component="topic/reply/locked" class="d-flex gap-2 align-items-center fw-semibold btn btn-sm btn-primary disabled {{{ if (privileges.topics:reply || !locked) }}}hidden{{{ end }}}" disabled><i class="fa fa-fw fa-lock"></i> [[topic:locked]]</a>
 {{{ else }}}
 	{{{ if !privileges.topics:reply }}}
-	<a component="topic/reply/guest" href="{config.relative_path}/login" class="d-flex gap-2 align-items-center fw-semibold btn btn-sm btn-primary"><i class="fa fa-fw fa-reply {{{ if !config.theme.topicSidebarTools}}} d-sm-block d-md-none {{{ end }}}"></i><span class="d-none d-md-block">[[topic:guest-login-reply]]</span></a>
+	<a component="topic/reply/guest" href="{config.relative_path}/login" class="d-flex gap-2 align-items-center fw-semibold btn btn-sm btn-primary"><i class="fa fa-fw fa-sign-in {{{ if !config.theme.topicSidebarTools}}} d-sm-block d-md-none {{{ end }}}"></i><span>[[topic:guest-login-reply]]</span></a>
 	{{{ end }}}
 {{{ end }}}