nodebb-theme-harmony 1.0.52 → 1.0.54

package/library.js

@@ -177,38 +177,7 @@ library.saveUserSettings = async function (hookData) {
 };
 
 library.filterMiddlewareRenderHeader = async function (hookData) {
-	const userSettings = await user.getSettings(hookData.req.uid);
-
-	const defaultSkin = _.capitalize(meta.config.bootswatchSkin) || '[[user:no-skin]]';
-	const defaultSkins = [
-		{ name: `[[user:default, ${defaultSkin}]]`, value: '', selected: userSettings.bootswatchSkin === '' },
-		{ name: '[[user:no-skin]]', value: 'noskin', selected: userSettings.bootswatchSkin === 'noskin' },
-	];
-	const lightSkins = [
-		'cerulean', 'cosmo', 'flatly', 'journal', 'litera',
-		'lumen', 'lux', 'materia', 'minty', 'morph', 'pulse', 'sandstone',
-		'simplex', 'sketchy', 'spacelab', 'united', 'yeti', 'zephyr',
-	];
-	const darkSkins = [
-		'cyborg', 'darkly', 'quartz', 'slate', 'solar', 'superhero', 'vapor',
-	];
-	function parseSkins(skins) {
-		skins = skins.map(skin => ({
-			name: _.capitalize(skin),
-			value: skin,
-		}));
-		skins.forEach((skin) => {
-			skin.selected = skin.value === userSettings.bootswatchSkin;
-		});
-		return skins;
-	}
-
-	hookData.templateData.bootswatchSkinOptions = {
-		default: defaultSkins,
-		light: parseSkins(lightSkins),
-		dark: parseSkins(darkSkins),
-	};
-	hookData.templateData.currentBSSkin = _.capitalize(hookData.templateData.bootswatchSkin);
+	hookData.templateData.bootswatchSkinOptions = await meta.css.getSkinSwitcherOptions(hookData.req.uid);
 	return hookData;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "nbbpm": {
     "compatibility": "^3.0.0"
   },

package/scss/topic.scss

@@ -35,6 +35,10 @@
 				}
 			}
 
+			> [component="post"] > [component="post/footer"] {
+				margin-left: calc($spacer * 2.5);
+			}
+
 			[component="post"] {
 				&.selected .post-container {
 					background-color: mix($body-bg, $body-color, 90%);
@@ -69,10 +73,6 @@
 						}
 					}
 				}
-
-				> [component="post/footer"] {
-					margin-left: calc($spacer * 2.5);
-				}
 			}
 
 			[component="post/reply-count"] {
@@ -120,8 +120,9 @@
 
 		[component="post"] {
 			padding-top: 0 !important;
-
+			padding-bottom: $spacer;
 			&:last-of-type {
+				padding-bottom: 0;
 				.post-footer {
 					border-bottom: none !important;
 				}

package/templates/account/edit.tpl

@@ -95,7 +95,7 @@
 		<label class="form-label text-sm fw-semibold">[[user:sso.title]]</label>
 		<div class="list-group">
 			{{{ each sso }}}
-			<div class="list-group-item d-flex justify-content-between">
+			<div class="list-group-item d-flex align-items-center justify-content-between">
 				<a class="text-sm text-reset text-decoration-none" data-component="{./component}" href="{./url}" target="{{{ if ./associated }}}_blank{{{ else }}}_top{{{ end }}}">
 					{{{ if ./icon }}}<i class="fa {./icon}"></i>{{{ end }}}
 					{{{ if ./associated }}}[[user:sso.associated]]{{{ else }}}[[user:sso.not-associated]]{{{ end }}}

package/templates/partials/skin-switcher.tpl

@@ -40,6 +40,11 @@
 				<a href="#" class="dropdown-item rounded-1" data-value="{./value}">{./name} <i class="fa fa-fw fa-check {{{ if !./selected }}} invisible {{{ end }}}"></i></a>
 			</li>
 			{{{ end }}}
+			{{{ each bootswatchSkinOptions.custom }}}
+			<li>
+				<a href="#" class="dropdown-item rounded-1" data-value="{./value}">{./name} <i class="fa fa-fw fa-check {{{ if !./selected }}} invisible {{{ end }}}"></i></a>
+			</li>
+			{{{ end }}}
 		</div>
 	</ul>
 </div>