Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #724 from amyspark/fix-emojify-sidebar 

Fix username emojification in sidebar
This commit is contained in:
AkiraFukushima 2018-11-18 11:39:25 +09:00 committed by GitHub
parent 564cdbd152 c0e966722b
commit bc70ac6e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue
View File

@ -60,8 +60,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="username"> <div class="username" v-html="username(account)">
{{ username(account) }}
</div> </div>
<div class="account"> <div class="account">
@{{ account.acct }} @{{ account.acct }}
@ -110,6 +109,7 @@
import { mapState } from 'vuex' import { mapState } from 'vuex'
import { shell } from 'electron' import { shell } from 'electron'
import { findLink } from '~/src/renderer/utils/tootParser' import { findLink } from '~/src/renderer/utils/tootParser'
import emojify from '~/src/renderer/utils/emojify'
import Timeline from './AccountProfile/Timeline' import Timeline from './AccountProfile/Timeline'
import Follows from './AccountProfile/Follows' import Follows from './AccountProfile/Follows'
import Followers from './AccountProfile/Followers' import Followers from './AccountProfile/Followers'
@ -158,7 +158,7 @@ export default {
methods: { methods: {
username (account) { username (account) {
if (account.display_name !== '') { if (account.display_name !== '') {
return account.display_name return emojify(account.display_name, account.emojis)
} else { } else {
return account.username return account.username
} }
@ -315,11 +315,16 @@ export default {
} }
} }
.username { .username /deep/ {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: calc(var(--base-font-size) * 1.71); font-size: calc(var(--base-font-size) * 1.71);
margin: 0 auto 12px auto; margin: 0 auto 12px auto;
.emojione {
max-width: 1em;
max-height: 1em;
}
} }
.account { .account {