diff --git a/src/App.scss b/src/App.scss index be6929f69..01f24d0ca 100644 --- a/src/App.scss +++ b/src/App.scss @@ -21,7 +21,7 @@ } html { - font-size: var(--textSize, 14px); + font-size: var(--textSize, 1rem); --navbar-height: var(--navbarSize, 3.5rem); --emoji-size: var(--emojiSize, 32px); diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index f9b306fb4..8e572d1d2 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -140,7 +140,7 @@ const EmojiPicker = { }, updateEmojiSize () { const css = window.getComputedStyle(this.$refs.popover.$el) - const fontSize = css.getPropertyValue('font-size') || '14px' + const fontSize = css.getPropertyValue('font-size') || '1rem' const emojiSize = css.getPropertyValue('--emojiSize') || '2.2rem' const fontSizeUnit = fontSize.replace(/[0-9,.]+/, '').trim() diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 0f325ea7f..09b37aa14 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -245,8 +245,8 @@ margin-right: 0; .emoji { - width: 14px; - height: 14px; + width: 1em; + height: 1em; vertical-align: middle; object-fit: contain; } diff --git a/src/modules/instance.js b/src/modules/instance.js index 93f81e4d8..7317debf8 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -108,7 +108,7 @@ const defaultState = { palette: null, style: null, emojiReactionsScale: 0.5, - textSize: '14px', + textSize: '1rem', emojiSize: '2.2rem', navbarSize: '3.5rem', panelHeaderSize: '3.2rem',