nodebb-theme-harmony 2.0.14 → 2.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "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/mark-unread.tpl

@@ -1,6 +1,6 @@
 {{{ if loggedIn }}}
 <button component="topic/mark-unread" class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center">
 	<i class="fa fa-fw fa-inbox text-primary"></i>
-	<span class="d-none d-md-inline fw-semibold">[[topic:mark-unread]]</span>
+	<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">[[topic:mark-unread]]</span>
 </button>
 {{{ end }}}

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

@@ -1,5 +1,5 @@
 <div component="topic/reply/container" class="btn-group {{{ if !privileges.topics:reply }}}hidden{{{ end }}}">
-	<a href="{config.relative_path}/compose?tid={tid}" class="d-flex {{{ if !config.theme.topicSidebarTools}}}px-3{{{ end }}} gap-2 align-items-center btn btn-sm btn-primary fw-semibold" component="topic/reply" data-ajaxify="false" role="button"><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:reply]]</span></a>
+	<a href="{config.relative_path}/compose?tid={tid}" class="d-flex {{{ if !config.theme.topicSidebarTools}}}px-3{{{ end }}} gap-2 align-items-center btn btn-sm btn-primary fw-semibold" component="topic/reply" data-ajaxify="false" role="button"><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 text-truncate text-nowrap">[[topic:reply]]</span></a>
 	<button type="button" class="btn btn-sm btn-primary dropdown-toggle flex-0" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[topic:reply-options]]">
 		<span class="caret"></span>
 	</button>
@@ -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-sign-in {{{ 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 }}}

package/templates/partials/topic/sort.tpl

@@ -1,7 +1,7 @@
 <div class="btn-group bottom-sheet" component="thread/sort">
-	<button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:post-sort-option, {sortOptionLabel}]]">
+	<button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle text-truncate" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:post-sort-option, {sortOptionLabel}]]">
 		<i class="fa fa-fw fa-arrow-down-wide-short text-primary"></i>
-		<span class="d-none d-md-inline fw-semibold">{sortOptionLabel}</span>
+		<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">{sortOptionLabel}</span>
 	</button>
 
 	<ul class="dropdown-menu p-1 text-sm" role="menu">

package/templates/partials/topic/tools.tpl

@@ -1,8 +1,8 @@
 {{{ if privileges.view_thread_tools }}}
 <div class="btn-group thread-tools bottom-sheet">
-	<button class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
+	<button class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 dropdown-toggle text-truncate" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<i class="fa fa-fw fa-gear text-primary"></i>
-		<span class="d-none d-md-inline fw-semibold">[[topic:thread-tools.title]]</span>
+		<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">[[topic:thread-tools.title]]</span>
 	</button>
 	<ul class="dropdown-menu p-1 text-sm" role="menu"></ul>
 </div>

package/templates/partials/topic/watch.tpl

@@ -1,19 +1,19 @@
 {{{ if config.loggedIn }}}
 <div class="btn-group bottom-sheet" component="topic/watch">
-	<button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
+	<button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 dropdown-toggle text-truncate" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<span component="topic/following/menu" class="d-flex gap-2 align-items-center{{{ if !isFollowing }}} hidden{{{ end }}}">
 			<i class="flex-shrink-0 fa fa-fw fa-bell-o text-primary"></i>
-			<span class="d-none d-md-inline fw-semibold">[[topic:watching]]</span>
+			<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">[[topic:watching]]</span>
 		</span>
 
 		<span component="topic/not-following/menu" class="d-flex gap-2 align-items-center{{{ if !isNotFollowing}}} hidden{{{ end }}}">
 			<i class="flex-shrink-0 fa fa-fw fa-bell-slash-o text-primary"></i>
-			<span class="d-none d-md-inline fw-semibold">[[topic:not-watching]]</span>
+			<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">[[topic:not-watching]]</span>
 		</span>
 
 		<span component="topic/ignoring/menu" class="d-flex gap-2 align-items-center{{{ if !isIgnoring }}} hidden{{{ end }}}">
 			<i class="flex-shrink-0 fa fa-fw fa-eye-slash text-primary"></i>
-			<span class="d-none d-md-inline fw-semibold">[[topic:ignoring]]</span>
+			<span class="d-none d-md-inline fw-semibold text-truncate text-nowrap">[[topic:ignoring]]</span>
 		</span>
 	</button>
 	<ul class="dropdown-menu p-1 text-sm" role="menu">

package/templates/topic.tpl

@@ -97,7 +97,7 @@
 						<div class="sticky-top" style="{{{ if config.theme.topicSidebarTools }}}top:2rem;{{{ else }}}top:6rem; {{{ end }}} z-index:1;">
 							<div class="d-flex flex-column gap-3 align-items-end">
 								{{{ if config.theme.topicSidebarTools }}}
-								<div class="d-flex flex-column gap-2" style="min-width: 170px;">
+								<div class="d-flex flex-column gap-2" style="width: 170px;">
 									<!-- IMPORT partials/topic/reply-button.tpl -->
 									<!-- IMPORT partials/topic/mark-unread.tpl -->
 									<!-- IMPORT partials/topic/watch.tpl -->