logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 8ead084421f4fa95d1db4ba295f4d55b5a075d24
parent 19ab07af964f34087a41ac3cbabd81b2bb3147da
Author: Henry Jameson <me@hjkos.com>
Date:   Thu,  4 Apr 2024 12:30:51 +0300

fix #1301

Diffstat:

Msrc/services/theme_data/theme2_keys.js6+++---
Msrc/services/theme_data/theme2_to_theme3.js2++
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/services/theme_data/theme2_keys.js b/src/services/theme_data/theme2_keys.js @@ -158,12 +158,12 @@ export default [ 'alertPopupNeutral', 'alertPopupNeutralText', - 'badgeNotification', - 'badgeNotificationText', - 'badgeNeutral', 'badgeNeutralText', + 'badgeNotification', + 'badgeNotificationText', + 'chatBg', 'chatMessageIncomingBg', diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js @@ -517,6 +517,8 @@ export const convertTheme2To3 = (data) => { } else if (newRule.component === 'Badge') { if (newRule.variant === 'notification') { return [newRule, { component: 'Root', directives: { '--badgeNotification': 'color | ' + newRule.directives.background } }] + } else if (newRule.variant === 'neutral') { + return [{ ...newRule, variant: 'normal' }] } else { return [newRule] }