gtsocial-umbx

commit 5c5c8ceaf0a0797100899af5119a00407f2045dc
parent 665d902fd72ef4fffb273502b6f010a94a47e15b
Author: f0x52 <f0x@cthu.lu>
Date:   Fri, 25 Nov 2022 16:37:57 +0100

[chore] Fix frogend admin emoji patch (#1148)

* fix className

* fix unable to set category on new emoji

* wrap emoji groups
Diffstat:
M
web/source/settings/admin/emoji/detail.js
 | 
2
+-
M
web/source/settings/components/fake-profile.jsx
 | 
4
++--
M
web/source/settings/style.css
 | 
1
+

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/web/source/settings/admin/emoji/detail.js b/web/source/settings/admin/emoji/detail.js
@@ -81,7 +81,7 @@ function EmojiDetail({emoji}) {
 	}
 
 	React.useEffect(() => {
-		if (category != emoji.category && !categoryState.open && !isNewCategory && emoji.category != undefined) {
+		if (category != emoji.category && !categoryState.open && !isNewCategory && category.trim().length > 0) {
 			console.log("updating to", category);
 			modifyEmoji({id: emoji.id, category: category.trim()});
 		}
diff --git a/web/source/settings/components/fake-profile.jsx b/web/source/settings/components/fake-profile.jsx
@@ -33,10 +33,10 @@ module.exports = function FakeProfile({}) {
 				<div id="profile-basic-filler2"></div>
 				<span className="avatar"><img className="avatarpreview" src={account.avatar} alt={account.avatar ? `avatar image for ${account.username}` : "None set"} /></span>
 				<div className="displayname">{account.display_name.trim().length > 0 ? account.display_name : account.username}</div>
-				<div class="usernamecontainer">
+				<div className="usernamecontainer">
 					<div className="username"><span>@{account.username}</span></div>
 					{(account.role && account.role != "user") && 
-						<div class={`role ${account.role}`}>{account.role}</div>
+						<div className={`role ${account.role}`}>{account.role}</div>
 					}
 				</div>
 			</div>
diff --git a/web/source/settings/style.css b/web/source/settings/style.css
@@ -410,6 +410,7 @@ span.form-info {
 
 		.emoji-group {
 			display: flex;
+			flex-wrap: wrap;
 	
 			a {
 				border-radius: $br;