Compare commits

..

No commits in common. "0a985fb7f4340a3c85be7b24e7f052209b631a8c" and "f8b0af62b28feb6f45efa29e08b57fa1a3d834f3" have entirely different histories.

2 changed files with 5 additions and 2 deletions

View file

@ -3,8 +3,7 @@
v-if="!hideStatus"
ref="root"
class="Status"
:class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }, userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
:style="[ userStyle ]"
:class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
>
<div
v-if="error"
@ -121,6 +120,8 @@
<div
v-if="!deleted"
:class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
:style="[ userStyle ]"
class="status-container"
:data-tags="tags"
>

View file

@ -374,6 +374,8 @@ const instance = {
// should have been "pack" field, that would be more useful
}).sort(byPackThenByName)
commit('setInstanceOption', { name: 'customEmoji', value: emoji })
state.standardEmojiGroupList = null
state.standardEmojiList = null
} else {
throw (res)
}