nodebb-theme-harmony 1.0.0-beta.80 → 1.0.0-beta.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "1.0.0-beta.80",
+  "version": "1.0.0-beta.82",
   "nbbpm": {
     "compatibility": "^3.0.0"
   },

package/scss/modules/topics-list.scss

@@ -20,7 +20,13 @@
 	&.unread .title {
 		color: $link-color;
 	}
+
 	.ui-sortable-handle {
 		cursor: move;
 	}
+
+	.topic-thumb img {
+		width: 80px;
+		height: auto;
+	}
 }

package/templates/partials/notifications_list.tpl

@@ -5,7 +5,7 @@
 {{{ each notifications }}}
 <li class="{./readClass} mb-2 p-1" data-nid="{./nid}" data-path="{./path}" {{{ if ./pid }}}data-pid="{./pid}"{{{ end }}}{{{ if ./tid }}}data-tid="{./tid}"{{{ end }}}>
 	<div class="d-flex gap-1 justify-content-between">
-		<div class="d-flex gap-2">
+		<div class="d-flex gap-2 flex-grow-1">
 			{{{ if ./image }}}
 			{{{ if ./from }}}
 			<a class="text-decoration-none" href="{config.relative_path}/user/{./user.userslug}"><img class="avatar avatar-rounded" style="--avatar-size: 32px;" src="{./image}" /></a>
@@ -13,8 +13,8 @@
 			{{{ else }}}
 			<a class="text-decoration-none"  href="{config.relative_path}/user/{./user.userslug}"><div class="avatar avatar-rounded" style="--avatar-size: 32px; background-color: {./user.icon:bgColor};">{./user.icon:text}</div></a>
 			{{{ end }}}
-			<div class=" d-flex flex-column">
-				<a href="{./path}" class="text-decoration-none text-reset text-break text-sm">
+			<div class=" d-flex flex-grow-1 flex-column position-relative">
+				<a href="{./path}" class="text-decoration-none text-reset text-break text-sm stretched-link">
 					{./bodyShort}
 				</a>
 				<div class="text-xs text-muted">{{{ if ./timeagoLong }}}{./timeagoLong}{{{ else }}}<span class="timeago" title="{./datetimeISO}"></span>{{{ end }}}</div>

package/templates/partials/topic/post.tpl

@@ -37,13 +37,13 @@
 			<span class="badge bg-danger rounded-1">[[user:banned]]</span>
 			{{{ end }}}
 
-			<div class="d-flex gap-1 hidden-xs align-items-center">
+			<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 }}}
+					{{{ if posts.toPid }}}
+					{generateRepliedTo(@value, config.timeagoCutoff)}
+					{{{ else }}}
+					{generateWrote(@value, config.timeagoCutoff)}
+					{{{ end }}}
 				</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, {./editedISO}]]"></i>

package/templates/partials/topics_list.tpl

@@ -11,15 +11,19 @@
 		<div class="row">
 			<div class="col-md-7 col-sm-9 col-12 content d-flex">
 				<div class="me-3">
+					{{{ if ./thumbs.length }}}
+					<div class="topic-thumb">
+						<a href="{./thumbs.0.url}">
+							<img class="topic-thumb rounded-1" src="{./thumbs.0.url}" class="not-responsive" />
+						</a>
+					</div>
+					{{{ else }}}
 					<div class="avatar">
 						<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none">
-							{{{ if ./thumbs.length }}}
-							<img class="topic-thumb rounded-1" width="80" height="auto" src="{./thumbs.0.url}" class="not-responsive" />
-							{{{ else }}}
 							{buildAvatar(./user, "40px", true, "avatar-tooltip not-responsive")}
-							{{{ end }}}
 						</a>
 					</div>
+					{{{ end }}}
 				</div>
 				<div class="d-flex flex-column gap-1">
 					<h2 component="topic/header" class="text-break title mb-1 {{{ if showSelect }}}me-4{{{ end }}} me-md-0 text-md fw-bold">

package/templates/post-queue.tpl

@@ -41,10 +41,10 @@
 	{{{ end }}}
 
 	{{{ each posts }}}
-	<div class="card mb-4" data-id="{./id}">
+	<div class="card mb-4" data-id="{./id}" data-uid="{./user.uid}">
 		<div class="row g-0">
-			<div class="col-md-2 bg-light">
-				<ul class="list-unstyled ps-0 mb-0 border-end">
+			<div class="col-sm-4 col-md-3 bg-light rounded-start">
+				<ul class="list-unstyled ps-0 mb-0 border-end h-100">
 					<li class="card-body border-bottom position-relative">
 						{{{ if !singlePost }}}
 						<input id="{./id}" type="checkbox" class="form-check-input" autocomplete="off" />
@@ -54,7 +54,29 @@
 						</label>
 					</li>
 					<li class="card-body border-bottom">
-						<div class="text-xs fw-semibold mb-1">[[post-queue:user]]</div>
+						<div class="d-flex text-xs fw-semibold mb-1 align-items-center">
+							[[post-queue:user]]
+							{{{ if ((privileges.ban || privileges.mute) || privileges.admin:users) }}}
+							<div class="ms-auto btn-group bottom-sheet">
+								<button href="#" class="btn btn-outline-sm text-xs dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Actions</button>
+								<ul class="dropdown-menu">
+									{{{ if privileges.ban }}}
+									<li class="{{{ if target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="ban">[[user:ban_account]]</a></li>
+									<li class="{{{ if !target.user.banned }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unban">[[user:unban_account]]</a></li>
+									{{{ end }}}
+									{{{ if privileges.mute}}}
+									<li class="{{{ if target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="mute">[[user:mute_account]]</a></li>
+									<li class="{{{ if !target.user.muted }}}hidden{{{ end }}}"><a class="dropdown-item" href="#" data-action="unmute">[[user:unmute_account]]</a></li>
+									{{{ end }}}
+									{{{ if privileges.admin:users }}}
+									<li><a class="dropdown-item" href="#" data-action="delete-account">[[user:delete_account_as_admin]]</a></li>
+									<li><a class="dropdown-item" href="#" data-action="delete-content">[[user:delete_content]]</a></li>
+									<li><a class="dropdown-item" href="#" data-action="delete-all">[[user:delete_all]]</a></li>
+									{{{ end }}}
+								</ul>
+							</div>
+							{{{ end }}}
+						</div>
 						<div class="small">
 							{{{ if posts.user.userslug}}}
 							<a class="text-decoration-none" href="{config.relative_path}/uid/{posts.user.uid}">{buildAvatar(posts.user, "24px", true, "not-responsive")} {posts.user.username}</a>
@@ -98,10 +120,10 @@
 					</li>
 				</ul>
 			</div>
-			<div class="col-md-10 d-flex flex-column">
+			<div class="col-sm-8 col-md-9 d-flex flex-column">
 				<div class="post-content mb-auto text-break p-3 pb-0 h-100">{posts.data.content}</div>
-				<div class="post-content-editable hidden">
-					<textarea class="form-control w-100" style="height:300px;">{posts.data.rawContent}</textarea>
+				<div class="post-content-editable flex-grow-1 hidden">
+					<textarea class="form-control w-100 h-100 p-3">{posts.data.rawContent}</textarea>
 				</div>
 				<div class="border-top p-3 d-grid d-md-flex gap-2">
 					{{{ if canAccept }}}
@@ -115,15 +137,6 @@
 				</div>
 			</div>
 		</div>
-		<div class="card-body" style="display: none;">
-			<div>
-				<strong>[[post-queue:content]] <i class="fa fa-fw fa-edit" data-bs-toggle="tooltip" title="[[post-queue:content-editable]]"></i></strong>
-
-			</div>
-		</div>
-		<div class="card-footer text-end" style="display: none;">
-
-		</div>
 	</div>
 	{{{ end }}}
 </div>