nodebb-theme-harmony 1.0.0-beta.67 → 1.0.0-beta.69

package/package.json

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

package/scss/sidebar.scss

@@ -76,7 +76,7 @@
 	.chats-dropdown, .notifications-dropdown, .drafts-dropdown {
 		min-width: 300px;
 		width: 300px;
-		ul {
+		.chat-list {
 			max-height: 400px;
 			overflow-y: auto;
 		}

package/templates/chats.tpl

@@ -14,11 +14,11 @@
 			</div>
 		</div>
 		<hr class="text-muted opacity-25 my-1">
-		<ul component="chat/recent" class="chats-list list-unstyled overflow-auto mb-0" data-nextstart="{nextStart}">
+		<div component="chat/recent" class="chats-list overflow-auto mb-0 pe-1" data-nextstart="{nextStart}">
 			{{{each rooms}}}
 			<!-- IMPORT partials/chats/recent_room.tpl -->
 			{{{end}}}
-		</ul>
+		</div>
 	</div>
 	<div class="flex-1 ms-md-2 ps-md-2 border-1 border-start-md h-100" component="chat/main-wrapper">
 		<!-- IMPORT partials/chats/message-window.tpl -->

package/templates/notifications.tpl

@@ -1,6 +1,6 @@
 <div class="notifications">
 	<div class="btn-toolbar justify-content-end" role="toolbar">
-		<button class="btn btn-light" component="notifications/mark_all">[[notifications:mark_all_read]]</button>
+		<button class="btn btn-sm btn-light" component="notifications/mark_all">[[notifications:mark_all_read]]</button>
 	</div>
 
 	<hr class="text-muted opacity-25"/>

package/templates/partials/chats/recent_room.tpl

@@ -1,4 +1,4 @@
-<li component="chat/recent/room" data-roomid="{./roomId}" data-full="1" class="{{{ if !@last }}}border-bottom mb-1{{{ end }}} rounded-1 {{{ if ./unread }}}unread{{{ end }}}">
+<div component="chat/recent/room" data-roomid="{./roomId}" data-full="1" class="rounded-1 {{{ if ./unread }}}unread{{{ end }}}">
 	<div class="d-flex gap-1 justify-content-between p-1">
 		<div class="position-relative d-flex flex-grow-1 gap-2 justify-content-start align-items-start">
 			<div class="main-avatar">
@@ -42,4 +42,5 @@
 			</button>
 		</div>
 	</div>
-</li>
+</div>
+<hr class="text-muted opacity-25 my-1" />

package/templates/partials/sidebar/chats.tpl

@@ -10,8 +10,8 @@
 </a>
 <ul class="chats-dropdown dropdown-menu p-1 shadow">
 	<li>
-		<ul component="chat/list" class="chat-list chats-list list-unstyled overscroll-behavior-contain p-0 ff-base">
-			<li class="rounded-1">
+		<div component="chat/list" class="chat-list chats-list overscroll-behavior-contain p-0 pe-1 ff-base">
+			<div class="rounded-1">
 				<div class="d-flex gap-1 justify-content-between">
 					<div class="dropdown-item p-2 d-flex gap-2 placeholder-wave">
 						<div class="main-avatar">
@@ -29,8 +29,8 @@
 						</button>
 					</div>
 				</div>
-			</li>
-		</ul>
+			</div>
+		</div>
 	</li>
 	<li class="dropdown-divider"></li>
 	<li class="notif-dropdown-link">

package/templates/partials/tags/filter-dropdown-content.tpl

@@ -0,0 +1,31 @@
+<button type="button" class="btn-ghost-sm d-flex gap-2 align-items-baseline dropdown-toggle" data-bs-toggle="dropdown">
+    {{{ if selectedTag }}}
+    <span class="d-inline-flex align-items-center gap-1">
+        <i class="fa fa-fw fa-tags link-primary"></i>
+        <span class="visible-md-inline visible-lg-inline fw-semibold">{selectedTag.label}</span>
+    </span>
+    {{{ else }}}
+    <i class="fa fa-fw fa-tags link-primary"></i>
+    <span class="visible-md-inline visible-lg-inline fw-semibold">[[tags:all-tags]]</span>
+    {{{ end }}}
+</button>
+<div component="tag/filter/search" class="hidden position-absolute top-0">
+    <input type="text" class="form-control form-control-sm" autocomplete="off">
+</div>
+<ul component="tag/filter/list" class="dropdown-menu overflow-auto" role="menu" style="max-height: 500px;">
+    <li role="presentation" data-tag="">
+        <a class="dropdown-item" role="menu-item" href="#"><i component="tag/select/icon" class="fa fa-fw fa-check {{{if selectedTag }}}invisible{{{ end }}}"></i> [[tags:all-tags]]</a>
+    </li>
+    {{{ each tagItems }}}
+    <li role="presentation" data-tag="{./valueEscaped}">
+        <a class="dropdown-item" role="menu-item" href="#">
+            <i component="tag/select/icon" class="fa fa-fw fa-check {{{ if !./selected }}}invisible{{{ end }}}"></i>
+            <span component="tag-markup">
+                <div class="d-inline-flex align-items-center gap-1">
+                    {./valueEscaped}
+                </div>
+            </span>
+        </a>
+    </li>
+    {{{ end }}}
+</ul>

package/templates/partials/topic/post.tpl

@@ -38,14 +38,13 @@
 			{{{ end }}}
 
 			<div class="d-flex gap-1 hidden-xs align-items-center">
+				<span class="text-muted">
 				{{{ if posts.toPid }}}
-				<span class="text-muted">replied to</span><!-- FIX THIS, DOES NOT l10n PROPERLY -->
-				<a component="post/parent" data-topid="{posts.toPid}" href="{config.relative_path}/post/{posts.toPid}">{{{ if posts.parent.username }}}{posts.parent.username}{{{ else }}}[[global:guest]]{{{ end }}}</a>
+				{generateRepliedTo(@value, config.timeagoCutoff)}
 				{{{ else }}}
-				<span class="text-muted">wrote</span><!-- FIX THIS, DOES NOT l10n PROPERLY -->
+				{generateWrote(@value, config.timeagoCutoff)}
 				{{{ end }}}
-
-				<a class="permalink text-muted" href="{config.relative_path}/post/{posts.pid}"><span class="timeago" title="{posts.timestampISO}"></span></a>
+				</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>
 				<span data-editor="{posts.editor.userslug}" component="post/editor" class="visually-hidden">[[global:last_edited_by, {posts.editor.username}]] <span class="timeago" title="{posts.editedISO}"></span></span>

package/templates/partials/topic-list-bar.tpl

@@ -4,6 +4,7 @@
 			<ul component="category/controls" class="navbar-nav me-auto gap-2 align-items-center">
 				{{{ if template.category }}}
 				<!-- IMPORT partials/category/watch.tpl -->
+				<!-- IMPORT partials/tags/filter-dropdown-left.tpl -->
 				<!-- IMPORT partials/category/sort.tpl -->
 				{{{ end }}}
 				{{{ if (template.popular || template.top)}}}
@@ -12,6 +13,7 @@
 				{{{ if (template.unread || (template.recent || (template.popular || template.top))) }}}
 				<!-- IMPORT partials/topic-filters.tpl -->
 				<!-- IMPORT partials/category/filter-dropdown-left.tpl -->
+				<!-- IMPORT partials/tags/filter-dropdown-left.tpl -->
 				{{{ end }}}
 				{{{ if template.unread }}}
 				<div class="markread btn-group {{{ if !topics.length }}}hidden{{{ end }}}">