undo the custom emoji stuff

Signed-off-by: Sam Therapy <sam@samtherapy.net>
nu-8777
Not Sam 8 months ago
parent 52fea46702
commit 5fcd6b1957
Signed by untrusted user: NotSam
GPG Key ID: 4D8B07C18F31ACBD

@ -11,23 +11,8 @@
@click="emojiOnClick(reaction.name, $event)"
@mouseenter="fetchEmojiReactionsByIfMissing()"
>
<span
v-if="reaction.url !== null"
>
<img
:src="reaction.url"
:title="reaction.name"
class="reaction-emoji"
width="2.55em"
>
{{ reaction.count }}
</span>
<span v-else>
<span class="reaction-emoji unicode-emoji">
{{ reaction.name }}
</span>
<span>{{ reaction.count }}</span>
</span>
<span class="reaction-emoji">{{ reaction.name }}</span>
<span>{{ reaction.count }}</span>
</button>
</UserListPopover>
<a
@ -51,10 +36,6 @@
flex-wrap: wrap;
}
.unicode-emoji {
font-size: 210%;
}
.emoji-reaction {
padding: 0 0.5em;
margin-right: 0.5em;
@ -64,7 +45,6 @@
justify-content: center;
box-sizing: border-box;
.reaction-emoji {
width: 2.55em !important;
margin-right: 0.25em;
}
&:focus {

@ -63,10 +63,7 @@ const ReactButton = {
if (this.filterWord !== '') {
const filterWordLowercase = this.filterWord.toLowerCase()
let orderedEmojiList = []
for (const emoji of [
...this.$store.state.instance.emoji,
...this.$store.state.instance.customEmoji
]) {
for (const emoji of this.$store.state.instance.emoji) {
if (emoji.replacement === this.filterWord) return [emoji]
const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
@ -79,9 +76,7 @@ const ReactButton = {
}
return orderedEmojiList.flat()
}
return [
...this.$store.state.instance.emoji
] || []
return this.$store.state.instance.emoji || []
},
mergedConfig () {
return this.$store.getters.mergedConfig

@ -38,17 +38,7 @@
class="emoji-button"
:title="emoji.displayText"
@click="addReaction($event, emoji.replacement, close, keepReactOpen)"
>
<img
v-if="emoji.imageUrl !== false"
:src="emoji.imageUrl"
width="30px"
class="custom-reaction"
>
<span v-else>
{{ emoji.replacement }}
</span>
</span>
/>
<div class="reaction-bottom-fader" />
</div>
</template>
@ -71,10 +61,6 @@
<style lang="scss">
@import '../../_variables.scss';
.custom-reaction {
width: 30px !important;
}
.ReactButton {
.reaction-picker-filter {
padding: 0.5em;

@ -106,22 +106,10 @@
</ChoiceSetting>
</li>
<li>
<BooleanSetting path="minimalScopesMode">
{{ $t('settings.minimal_scopes_mode') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="sensitiveByDefault">
{{ $t('settings.sensitive_by_default') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="sensitiveIfSubject">
{{ $t('settings.sensitive_if_subject') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="alwaysShowNewPostButton">
<BooleanSetting
path="alwaysShowNewPostButton"
expert="1"
>
{{ $t('settings.always_show_post_button') }}
</BooleanSetting>
</li>

@ -3,7 +3,6 @@ import ISO6391 from 'iso-639-1'
import _ from 'lodash'
const specialLanguageCodes = {
'en_nyan': 'en-NYAN',
'ja_easy': 'ja',
'zh_Hant': 'zh-HANT',
'zh': 'zh-Hans'
@ -15,7 +14,6 @@ const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_
const getLanguageName = (code) => {
const specialLanguageNames = {
'en_nyan': 'English (Nyan)',
'ja_easy': 'やさしいにほんご',
'zh': '简体中文',
'zh_Hant': '繁體中文'

Loading…
Cancel
Save