From c34590c43983711152a843a2e36b991a5fe3bcdf Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 7 Feb 2024 15:53:34 +0200 Subject: update, should inherit stuff properly now. --- src/services/theme_data/theme2_keys.js | 176 +++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 src/services/theme_data/theme2_keys.js (limited to 'src/services/theme_data/theme2_keys.js') diff --git a/src/services/theme_data/theme2_keys.js b/src/services/theme_data/theme2_keys.js new file mode 100644 index 00000000..09092e0c --- /dev/null +++ b/src/services/theme_data/theme2_keys.js @@ -0,0 +1,176 @@ +export default [ + 'bg', + 'wallpaper', + 'fg', + 'text', + 'underlay', + 'link', + 'accent', + 'faint', + 'faintLink', + 'postFaintLink', + + 'cBlue', + 'cRed', + 'cGreen', + 'cOrange', + + 'profileBg', + 'profileTint', + + 'highlight', + 'highlightLightText', + 'highlightPostLink', + 'highlightFaintText', + 'highlightFaintLink', + 'highlightPostFaintLink', + 'highlightText', + 'highlightLink', + 'highlightIcon', + + 'popover', + 'popoverLightText', + 'popoverPostLink', + 'popoverFaintText', + 'popoverFaintLink', + 'popoverPostFaintLink', + 'popoverText', + 'popoverLink', + 'popoverIcon', + + 'selectedPost', + 'selectedPostFaintText', + 'selectedPostLightText', + 'selectedPostPostLink', + 'selectedPostFaintLink', + 'selectedPostText', + 'selectedPostLink', + 'selectedPostIcon', + + 'selectedMenu', + 'selectedMenuLightText', + 'selectedMenuFaintText', + 'selectedMenuFaintLink', + 'selectedMenuText', + 'selectedMenuLink', + 'selectedMenuIcon', + + 'selectedMenuPopover', + 'selectedMenuPopoverLightText', + 'selectedMenuPopoverFaintText', + 'selectedMenuPopoverFaintLink', + 'selectedMenuPopoverText', + 'selectedMenuPopoverLink', + 'selectedMenuPopoverIcon', + + 'lightText', + + 'postLink', + + 'postGreentext', + + 'postCyantext', + + 'border', + + 'poll', + 'pollText', + + 'icon', + + // Foreground, + 'fgText', + 'fgLink', + + // Panel header, + 'panel', + 'panelText', + 'panelFaint', + 'panelLink', + + // Top bar, + 'topBar', + 'topBarLink', + + // Tabs, + 'tab', + 'tabText', + 'tabActiveText', + + // Buttons, + 'btn', + 'btnText', + 'btnPanelText', + 'btnTopBarText', + + // Buttons: pressed, + 'btnPressed', + 'btnPressedText', + 'btnPressedPanel', + 'btnPressedPanelText', + 'btnPressedTopBar', + 'btnPressedTopBarText', + + // Buttons: toggled, + 'btnToggled', + 'btnToggledText', + 'btnToggledPanelText', + 'btnToggledTopBarText', + + // Buttons: disabled, + 'btnDisabled', + 'btnDisabledText', + 'btnDisabledPanelText', + 'btnDisabledTopBarText', + + // Input fields, + 'input', + 'inputText', + 'inputPanelText', + 'inputTopbarText', + + 'alertError', + 'alertErrorText', + 'alertErrorPanelText', + + 'alertWarning', + 'alertWarningText', + 'alertWarningPanelText', + + 'alertSuccess', + 'alertSuccessText', + 'alertSuccessPanelText', + + 'alertNeutral', + 'alertNeutralText', + 'alertNeutralPanelText', + + 'alertPopupError', + 'alertPopupErrorText', + + 'alertPopupWarning', + 'alertPopupWarningText', + + 'alertPopupSuccess', + 'alertPopupSuccessText', + + 'alertPopupNeutral', + 'alertPopupNeutralText', + + 'badgeNotification', + 'badgeNotificationText', + + 'badgeNeutral', + 'badgeNeutralText', + + 'chatBg', + + 'chatMessageIncomingBg', + 'chatMessageIncomingText', + 'chatMessageIncomingLink', + 'chatMessageIncomingBorder', + 'chatMessageOutgoingBg', + 'chatMessageOutgoingText', + 'chatMessageOutgoingLink', + 'chatMessageOutgoingBorder' +] -- cgit v1.2.3-70-g09d2 From 15d8daa7ec21fd6cbb9be32148d7596471cf7da2 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 28 Feb 2024 12:51:22 +0200 Subject: somehow i missed this one --- src/services/theme_data/theme2_keys.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/services/theme_data/theme2_keys.js') diff --git a/src/services/theme_data/theme2_keys.js b/src/services/theme_data/theme2_keys.js index 09092e0c..69089e13 100644 --- a/src/services/theme_data/theme2_keys.js +++ b/src/services/theme_data/theme2_keys.js @@ -90,6 +90,7 @@ export default [ // Top bar, 'topBar', + 'topBarText', 'topBarLink', // Tabs, -- cgit v1.2.3-70-g09d2 From 8ead084421f4fa95d1db4ba295f4d55b5a075d24 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 4 Apr 2024 12:30:51 +0300 Subject: fix #1301 --- src/services/theme_data/theme2_keys.js | 6 +++--- src/services/theme_data/theme2_to_theme3.js | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/services/theme_data/theme2_keys.js') diff --git a/src/services/theme_data/theme2_keys.js b/src/services/theme_data/theme2_keys.js index 69089e13..ffc5627c 100644 --- 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 index e150369f..6ea12836 100644 --- 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] } -- cgit v1.2.3-70-g09d2