resolve conflicts prior to merge

This commit is contained in:
qbism 2023-03-18 11:52:32 -04:00
parent 97eb259cca
commit 215a1b9391
4 changed files with 14 additions and 5 deletions

View file

@ -4,8 +4,6 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
<title>3V.IS</title>
<link rel="stylesheet" href="/static/font/css/fontello.css">
<link rel="stylesheet" href="/static/font/css/animation.css">
<link rel="stylesheet" href="/static/font/tiresias.css">
<link rel="stylesheet" href="/static/font/css/lato.css">
<link rel="stylesheet" href="/static/mfm.css">

View file

@ -51,6 +51,7 @@ const EmojiPicker = {
onEmoji (emoji) {
const value = emoji.imageUrl ? `:${emoji.displayText}:` : emoji.replacement
this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
this.$store.commit('emojiUsed', emoji)
},
onWheel (e) {
e.preventDefault()
@ -96,6 +97,7 @@ const EmojiPicker = {
)
},
emojis () {
const recentEmojis = this.$store.getters.recentEmojis
const standardEmojis = this.$store.state.instance.emoji || []
const customEmojis = this.sortedEmoji
const emojiPacks = []
@ -108,6 +110,15 @@ const EmojiPicker = {
})
})
return [
{
id: 'recent',
text: this.$t('emoji.recent'),
first: {
imageUrl: '',
replacement: '🕒',
},
emojis: this.filterByKeyword(recentEmojis)
},
{
id: 'standard',
text: this.$t('emoji.unicode'),

View file

@ -18,7 +18,6 @@
:src="reaction.url"
:title="reaction.name"
class="reaction-emoji"
width="2.55em"
height="2.55em"
>
{{ reaction.count }}
@ -50,6 +49,7 @@
display: flex;
margin-top: 0.25em;
flex-wrap: wrap;
container-type: inline-size;
}
.unicode-emoji {
@ -65,7 +65,8 @@
justify-content: center;
box-sizing: border-box;
.reaction-emoji {
width: 2.55em !important;
width: auto;
max-width: 96cqw;
height: 2.55em !important;
margin-right: 0.25em;
}

View file

@ -16,5 +16,4 @@
:root {
--post-line-height: 2.0;
}