extern/gotosocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-27 02:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* fix className

* fix unable to set category on new emoji

* wrap emoji groups
This commit is contained in:
f0x52 2022-11-25 16:37:57 +01:00 committed by GitHub
parent 665d902fd7
commit 5c5c8ceaf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/source/settings/admin/emoji/detail.js
View File

@ -81,7 +81,7 @@ function EmojiDetail({emoji}) {
} }
React.useEffect(() => { 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); console.log("updating to", category);
modifyEmoji({id: emoji.id, category: category.trim()}); modifyEmoji({id: emoji.id, category: category.trim()});
} }

4
web/source/settings/components/fake-profile.jsx
View File

@ -33,10 +33,10 @@ module.exports = function FakeProfile({}) {
<div id="profile-basic-filler2"></div> <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> <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 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> <div className="username"><span>@{account.username}</span></div>
{(account.role && account.role != "user") && {(account.role && account.role != "user") &&
<div class={`role ${account.role}`}>{account.role}</div> <div className={`role ${account.role}`}>{account.role}</div>
} }
</div> </div>
</div> </div>

1
web/source/settings/style.css
View File

@ -410,6 +410,7 @@ span.form-info {
.emoji-group { .emoji-group {
display: flex; display: flex;
flex-wrap: wrap;
a { a {
border-radius: $br; border-radius: $br;