qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'emoji-fixes' into 'develop'

Browse source 
Another fix attempt

See merge request pleroma/pleroma-fe!1961
This commit is contained in:
HJ 2024-12-28 14:51:22 +00:00
parent 1ff3be579c 984dfd06c2
commit 86e1e6becf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/emoji_picker/emoji_picker.js
View file

@ -140,14 +140,14 @@ const EmojiPicker = {
},
updateEmojiSize () {
const css = window.getComputedStyle(this.$refs.popover.$el)
const fontSize = css.getPropertyValue('font-size')
const emojiSize = css.getPropertyValue('--emojiSize')
const fontSize = css.getPropertyValue('font-size') || '14px'
const emojiSize = css.getPropertyValue('--emojiSize') || '2.2rem'
const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '') || 'px'
const fontSizeValue = Number(fontSize.replace(/[^0-9,.]+/, '')) || 14
const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '')
const fontSizeValue = Number(fontSize.replace(/[^0-9,.]+/, ''))
const emojiSizeUnit = emojiSize.replace(/[0-9,.]+/, '') || 'rem'
const emojiSizeValue = Number(emojiSize.replace(/[^0-9,.]+/, '')) || 2.2
const emojiSizeUnit = emojiSize.replace(/[0-9,.]+/, '')
const emojiSizeValue = Number(emojiSize.replace(/[^0-9,.]+/, ''))
let fontSizeMultiplier
if (fontSizeUnit.endsWith('em')) {