aboutsummaryrefslogtreecommitdiff
path: root/src/modules/config.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2023-03-20 22:48:38 +0200
committerHenry Jameson <me@hjkos.com>2023-03-20 22:48:38 +0200
commit819cd41cf0c4b2140470bba2a36eb15ed811c5b7 (patch)
tree0608e5f10fa4028391e1100729e5fade4d3ba08c /src/modules/config.js
parent332ad77e3579d2b512ba236b3f2c94ad8875864d (diff)
parentfa532b1f005220743d036b7d103c47a043be7ae4 (diff)
Merge remote-tracking branch 'origin/develop' into improve_settings_reusability
* origin/develop: Translated using Weblate (Chinese (Simplified)) Generalize IntegerSetting into NumberSetting, add Integer/Float wrappers Allow custom emoji reactions: add option to scale reaction buttons Fix user-profile route crash on pinned favorites route Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions Allow custom emoji reactions
Diffstat (limited to 'src/modules/config.js')
-rw-r--r--src/modules/config.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/config.js b/src/modules/config.js
index 5e3f0105..56f8cba5 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -98,6 +98,7 @@ export const defaultState = {
sidebarColumnWidth: '25rem',
contentColumnWidth: '45rem',
notifsColumnWidth: '25rem',
+ emojiReactionsScale: 1.0,
navbarColumnStretch: false,
greentext: undefined, // instance default
useAtIcon: undefined, // instance default
@@ -205,6 +206,7 @@ const config = {
case 'sidebarColumnWidth':
case 'contentColumnWidth':
case 'notifsColumnWidth':
+ case 'emojiReactionsScale':
applyConfig(state)
break
case 'customTheme':