diff --git a/native/chat/message-preview.react.js b/native/chat/message-preview.react.js --- a/native/chat/message-preview.react.js +++ b/native/chat/message-preview.react.js @@ -80,7 +80,7 @@ color: 'listForegroundTertiaryLabel', }, secondary: { - color: 'listForegroundQuaternaryLabel', + color: 'listForegroundTertiaryLabel', }, unread: { color: 'listForegroundLabel', diff --git a/native/chat/settings/add-users-modal.react.js b/native/chat/settings/add-users-modal.react.js --- a/native/chat/settings/add-users-modal.react.js +++ b/native/chat/settings/add-users-modal.react.js @@ -267,7 +267,7 @@ paddingRight: 6, }, addButton: { - backgroundColor: 'greenButton', + backgroundColor: 'vibrantGreenButton', borderRadius: 3, flexDirection: 'row', paddingHorizontal: 10, diff --git a/native/chat/settings/delete-thread.react.js b/native/chat/settings/delete-thread.react.js --- a/native/chat/settings/delete-thread.react.js +++ b/native/chat/settings/delete-thread.react.js @@ -178,7 +178,7 @@ const unboundStyles = { deleteButton: { - backgroundColor: 'redButton', + backgroundColor: 'vibrantRedButton', borderRadius: 5, flex: 1, marginHorizontal: 24, diff --git a/native/chat/thread-list-modal.react.js b/native/chat/thread-list-modal.react.js --- a/native/chat/thread-list-modal.react.js +++ b/native/chat/thread-list-modal.react.js @@ -168,7 +168,7 @@ modal: { borderRadius: 8, paddingHorizontal: 0, - backgroundColor: 'subthreadsModalBackgroud', + backgroundColor: 'subthreadsModalBackground', paddingTop: 0, justifyContent: 'flex-start', }, diff --git a/native/navigation/community-drawer-content.react.js b/native/navigation/community-drawer-content.react.js --- a/native/navigation/community-drawer-content.react.js +++ b/native/navigation/community-drawer-content.react.js @@ -159,7 +159,7 @@ flex: 1, paddingRight: 8, paddingTop: 8, - backgroundColor: 'drawerBackgroud', + backgroundColor: 'drawerBackground', }, }; const labelUnboundStyles = { diff --git a/native/profile/custom-server-modal.react.js b/native/profile/custom-server-modal.react.js --- a/native/profile/custom-server-modal.react.js +++ b/native/profile/custom-server-modal.react.js @@ -86,7 +86,7 @@ const unboundStyles = { button: { - backgroundColor: 'greenButton', + backgroundColor: 'vibrantGreenButton', borderRadius: 5, marginHorizontal: 2, marginVertical: 2, diff --git a/native/profile/delete-account.react.js b/native/profile/delete-account.react.js --- a/native/profile/delete-account.react.js +++ b/native/profile/delete-account.react.js @@ -188,7 +188,7 @@ const unboundStyles = { deleteButton: { - backgroundColor: 'redButton', + backgroundColor: 'vibrantRedButton', borderRadius: 5, flex: 1, marginHorizontal: 24, diff --git a/native/profile/edit-password.react.js b/native/profile/edit-password.react.js --- a/native/profile/edit-password.react.js +++ b/native/profile/edit-password.react.js @@ -310,7 +310,7 @@ paddingVertical: 9, }, saveButton: { - backgroundColor: 'greenButton', + backgroundColor: 'vibrantGreenButton', borderRadius: 5, flex: 1, marginHorizontal: 24, diff --git a/native/themes/colors.js b/native/themes/colors.js --- a/native/themes/colors.js +++ b/native/themes/colors.js @@ -11,71 +11,64 @@ import type { GlobalTheme } from '../types/themes'; const light = Object.freeze({ - blockQuoteBackground: '#D3D3D3', - blockQuoteBorder: '#C0C0C0', - codeBackground: '#DCDCDC', - disabledButton: '#D3D3D3', + blockQuoteBackground: '#E0E0E0', + blockQuoteBorder: '#CCCCCC', + codeBackground: '#E0E0E0', + disabledButton: '#E0E0E0', disconnectedBarBackground: '#F5F5F5', editButton: '#A4A4A2', floatingButtonBackground: '#999999', - floatingButtonLabel: '#EEEEEE', - greenButton: '#6EC472', - greenText: 'green', + floatingButtonLabel: '#EBEBEB', headerChevron: '#0A0A0A', inlineEngagementBackground: '#E0E0E0', - inlineEngagementLabel: '#000000', - link: '#036AFF', - listBackground: 'white', - listBackgroundLabel: 'black', + inlineEngagementLabel: '#0A0A0A', + link: '#7E57C2', + listBackground: '#FFFFFF', + listBackgroundLabel: '#0A0A0A', listBackgroundSecondaryLabel: '#444444', listBackgroundTernaryLabel: '#999999', listChatBubble: '#F1F0F5', - listForegroundLabel: 'black', - listForegroundQuaternaryLabel: '#AAAAAA', + listForegroundLabel: '#0A0A0A', listForegroundSecondaryLabel: '#333333', listForegroundTertiaryLabel: '#666666', listInputBackground: '#F5F5F5', listInputBar: '#E2E2E2', - listInputBorder: '#AAAAAAAA', listInputButton: '#8E8D92', listIosHighlightUnderlay: '#DDDDDDDD', listSearchBackground: '#F5F5F5', listSearchIcon: '#8E8D92', - listSeparator: '#EEEEEE', - listSeparatorLabel: '#555555', - mintButton: '#44CC99', - modalBackground: '#EEEEEE', + listSeparatorLabel: '#666666', + modalBackground: '#EBEBEB', modalBackgroundLabel: '#333333', modalBackgroundSecondaryLabel: '#AAAAAA', modalButton: '#BBBBBB', - modalButtonLabel: 'black', - modalContrastBackground: 'black', - modalContrastForegroundLabel: 'white', + modalButtonLabel: '#0A0A0A', + modalContrastBackground: '#0A0A0A', + modalContrastForegroundLabel: '#FFFFFF', modalContrastOpacity: 0.7, - modalForeground: 'white', + modalForeground: '#FFFFFF', modalForegroundBorder: '#CCCCCC', - modalForegroundLabel: 'black', + modalForegroundLabel: '#0A0A0A', modalForegroundSecondaryLabel: '#888888', modalForegroundTertiaryLabel: '#AAAAAA', modalIosHighlightUnderlay: '#CCCCCCDD', modalSubtext: '#CCCCCC', - modalSubtextLabel: '#555555', + modalSubtextLabel: '#666666', navigationCard: '#FFFFFF', - navigationChevron: '#BAB9BE', + navigationChevron: '#CCCCCC', panelBackground: '#F5F5F5', panelBackgroundLabel: '#888888', - panelForeground: 'white', + panelForeground: '#FFFFFF', panelForegroundBorder: '#CCCCCC', - panelForegroundLabel: 'black', + panelForegroundLabel: '#0A0A0A', panelForegroundSecondaryLabel: '#333333', panelForegroundTertiaryLabel: '#888888', - panelIosHighlightUnderlay: '#EEEEEEDD', + panelIosHighlightUnderlay: '#EBEBEBDD', panelSecondaryForeground: '#F5F5F5', - panelSecondaryForegroundBorder: '#D1D1D6', + panelSecondaryForegroundBorder: '#CCCCCC', purpleLink: '#7E57C2', purpleButton: '#7E57C2', - redButton: '#BB8888', - redText: '#FF4444', + redText: '#F53100', spoiler: '#33332C', tabBarAccent: '#7E57C2', tabBarBackground: '#F5F5F5', @@ -84,8 +77,8 @@ vibrantRedButton: '#F53100', tooltipBackground: '#E0E0E0', logInSpacer: '#FFFFFF33', - logInText: 'white', - siweButton: 'white', + logInText: '#FFFFFF', + siweButton: '#FFFFFF', siweButtonText: '#1F1F1F', drawerExpandButton: '#808080', drawerExpandButtonDisabled: '#CCCCCC', @@ -93,10 +86,10 @@ drawerItemLabelLevel1: '#0A0A0A', drawerItemLabelLevel2: '#1F1F1F', drawerOpenCommunityBackground: '#F5F5F5', - drawerBackgroud: '#FFFFFF', + drawerBackground: '#FFFFFF', subthreadsModalClose: '#808080', - subthreadsModalBackgroud: '#EEEEEE', - subthreadsModalSearch: 'rgba(0, 0, 0, 0.08)', + subthreadsModalBackground: '#EBEBEB', + subthreadsModalSearch: '#00000008', }); export type Colors = $Exact; @@ -104,59 +97,53 @@ blockQuoteBackground: '#A9A9A9', blockQuoteBorder: '#808080', codeBackground: '#0A0A0A', - disabledButton: '#444444', - disconnectedBarBackground: '#1D1D1D', - editButton: '#5B5B5D', + disabledButton: '#404040', + disconnectedBarBackground: '#1F1F1F', + editButton: '#666666', floatingButtonBackground: '#666666', - floatingButtonLabel: 'white', - greenButton: '#43A047', - greenText: '#44FF44', + floatingButtonLabel: '#FFFFFF', headerChevron: '#FFFFFF', inlineEngagementBackground: '#666666', inlineEngagementLabel: '#FFFFFF', - link: '#129AFF', + link: '#AE94DB', listBackground: '#0A0A0A', - listBackgroundLabel: '#C7C7CC', + listBackgroundLabel: '#CCCCCC', listBackgroundSecondaryLabel: '#BBBBBB', - listBackgroundTernaryLabel: '#888888', + listBackgroundTernaryLabel: '#808080', listChatBubble: '#26252A', - listForegroundLabel: 'white', - listForegroundQuaternaryLabel: '#555555', + listForegroundLabel: '#FFFFFF', listForegroundSecondaryLabel: '#CCCCCC', - listForegroundTertiaryLabel: '#999999', - listInputBackground: '#1D1D1D', - listInputBar: '#555555', - listInputBorder: '#333333', - listInputButton: '#AAAAAA', + listForegroundTertiaryLabel: '#808080', + listInputBackground: '#1F1F1F', + listInputBar: '#666666', + listInputButton: '#CCCCCC', listIosHighlightUnderlay: '#BBBBBB88', - listSearchBackground: '#1D1D1D', - listSearchIcon: '#AAAAAA', - listSeparator: '#3A3A3C', - listSeparatorLabel: '#EEEEEE', - mintButton: '#44CC99', + listSearchBackground: '#1F1F1F', + listSearchIcon: '#CCCCCC', + listSeparatorLabel: '#EBEBEB', modalBackground: '#0A0A0A', modalBackgroundLabel: '#CCCCCC', - modalBackgroundSecondaryLabel: '#555555', + modalBackgroundSecondaryLabel: '#666666', modalButton: '#666666', - modalButtonLabel: 'white', - modalContrastBackground: 'white', - modalContrastForegroundLabel: 'black', + modalButtonLabel: '#FFFFFF', + modalContrastBackground: '#FFFFFF', + modalContrastForegroundLabel: '#0A0A0A', modalContrastOpacity: 0.85, - modalForeground: '#1C1C1E', - modalForegroundBorder: '#1C1C1E', - modalForegroundLabel: 'white', + modalForeground: '#1F1F1F', + modalForegroundBorder: '#1F1F1F', + modalForegroundLabel: '#FFFFFF', modalForegroundSecondaryLabel: '#AAAAAA', modalForegroundTertiaryLabel: '#666666', modalIosHighlightUnderlay: '#AAAAAA88', - modalSubtext: '#444444', + modalSubtext: '#404040', modalSubtextLabel: '#AAAAAA', navigationCard: '#2A2A2A', - navigationChevron: '#5B5B5D', + navigationChevron: '#666666', panelBackground: '#0A0A0A', - panelBackgroundLabel: '#C7C7CC', - panelForeground: '#1D1D1D', + panelBackgroundLabel: '#CCCCCC', + panelForeground: '#1F1F1F', panelForegroundBorder: '#2C2C2E', - panelForegroundLabel: 'white', + panelForegroundLabel: '#FFFFFF', panelForegroundSecondaryLabel: '#CCCCCC', panelForegroundTertiaryLabel: '#AAAAAA', panelIosHighlightUnderlay: '#313035', @@ -164,8 +151,7 @@ panelSecondaryForegroundBorder: '#666666', purpleLink: '#AE94DB', purpleButton: '#7E57C2', - redButton: '#FF4444', - redText: '#FF4444', + redText: '#F53100', spoiler: '#33332C', tabBarAccent: '#AE94DB', tabBarBackground: '#0A0A0A', @@ -174,8 +160,8 @@ vibrantRedButton: '#F53100', tooltipBackground: '#1F1F1F', logInSpacer: '#FFFFFF33', - logInText: 'white', - siweButton: 'white', + logInText: '#FFFFFF', + siweButton: '#FFFFFF', siweButtonText: '#1F1F1F', drawerExpandButton: '#808080', drawerExpandButtonDisabled: '#404040', @@ -183,10 +169,10 @@ drawerItemLabelLevel1: '#CCCCCC', drawerItemLabelLevel2: '#F5F5F5', drawerOpenCommunityBackground: '#191919', - drawerBackgroud: '#1F1F1F', + drawerBackground: '#1F1F1F', subthreadsModalClose: '#808080', - subthreadsModalBackgroud: '#1F1F1F', - subthreadsModalSearch: 'rgba(255, 255, 255, 0.04)', + subthreadsModalBackground: '#1F1F1F', + subthreadsModalSearch: '#FFFFFF04', }); const colors = { light, dark };