queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix lock icon not being shown when locking account in profile settings (#14190)

Browse source
This commit is contained in:
ThibG 2020-07-01 13:51:50 +02:00 committed by GitHub
parent 35cedc922c
commit 4babf5b8b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/packs/public.js
View file

@ -207,10 +207,12 @@ function main() {
delegate(document, '#account_locked', 'change', ({ target }) => { delegate(document, '#account_locked', 'change', ({ target }) => {
const lock = document.querySelector('.card .display-name i'); const lock = document.querySelector('.card .display-name i');
if (lock) {
if (target.checked) { if (target.checked) {
lock.style.display = 'inline'; delete lock.dataset.hidden;
} else { } else {
lock.style.display = 'none'; lock.dataset.hidden = 'true';
}
} }
}); });

4
app/javascript/styles/mastodon/accounts.scss
View file

@ -76,6 +76,10 @@
margin-left: 15px; margin-left: 15px;
text-align: left; text-align: left;
i[data-hidden] {
display: none;
}
strong { strong {
font-size: 15px; font-size: 15px;
color: $primary-text-color; color: $primary-text-color;

2
app/views/application/_card.html.haml
View file

@ -13,4 +13,4 @@
%strong.emojify.p-name= display_name(account, custom_emojify: true) %strong.emojify.p-name= display_name(account, custom_emojify: true)
%span %span
= acct(account) = acct(account)
= fa_icon('lock') if account.locked? = fa_icon('lock', { :data => ({hidden: true} unless account.locked?)})