From b7657d91388487345cfad3a0a0d06768ee6a6cf2 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Mon, 7 Sep 2026 00:50:55 +0200 Subject: [PATCH] Tweak some colors --- src/Navigation.tsx | 3 --- src/components/FormErrors.tsx | 14 +++++++------- src/components/PrivacyButton.tsx | 2 +- src/modules/events/EventList.tsx | 2 +- src/modules/membership/UserDelete.tsx | 4 ++-- src/modules/settings/NotificationRow.tsx | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 63db071..f9601be 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -18,9 +18,6 @@ import IconEvent from '@assets/icons/event.svg'; import IconInfo from '@assets/icons/information-circle.svg'; import IconPerson from '@assets/icons/person.svg'; -// This looks ugly, even though it's a recommended style from the branding profile. -// TODO: Change this -// also TODO: make sure battery indicator etc. is visible const defaultNavigationStyle = { headerTintColor: theme.colors.white, headerTitleAlign: 'center', diff --git a/src/components/FormErrors.tsx b/src/components/FormErrors.tsx index 5ecfc04..2702679 100644 --- a/src/components/FormErrors.tsx +++ b/src/components/FormErrors.tsx @@ -30,10 +30,8 @@ const FormErrors = ({ errors }: { errors: Record | Error }) => { return ( - - - {errorFormatted} - + + {errorFormatted} ); }; @@ -42,15 +40,17 @@ const styles = StyleSheet.create({ container: { flex: 1, flexDirection: 'row', - backgroundColor: '#fecaca', + backgroundColor: theme.colors.danger, padding: 12, borderRadius: 4, - borderWidth: 1, - borderColor: theme.colors.danger, }, icon: { marginRight: 8, }, + message: { + flex: 1, + color: theme.colors.white, + }, }); export default FormErrors; diff --git a/src/components/PrivacyButton.tsx b/src/components/PrivacyButton.tsx index 05e63aa..750bb8d 100644 --- a/src/components/PrivacyButton.tsx +++ b/src/components/PrivacyButton.tsx @@ -16,7 +16,7 @@ const styles = StyleSheet.create({ }, linkText: { ...theme.typography.body, - color: theme.colors.deepBrick, + color: theme.colors.chateauBlue, textAlign: 'center', textDecorationLine: 'underline', }, diff --git a/src/modules/events/EventList.tsx b/src/modules/events/EventList.tsx index 230161f..a6c6ff9 100644 --- a/src/modules/events/EventList.tsx +++ b/src/modules/events/EventList.tsx @@ -51,7 +51,7 @@ const EventList = () => { )} - + diff --git a/src/modules/membership/UserDelete.tsx b/src/modules/membership/UserDelete.tsx index 4829f3e..b95212f 100644 --- a/src/modules/membership/UserDelete.tsx +++ b/src/modules/membership/UserDelete.tsx @@ -67,7 +67,7 @@ const styles = StyleSheet.create({ paragraph: { ...theme.typography.body, textAlign: 'center', - color: theme.colors.black, + color: theme.colors.chateauBlue, paddingBottom: 10, }, bold: { @@ -84,7 +84,7 @@ const styles = StyleSheet.create({ headerTitle: { ...theme.typography.h2, textAlign: 'center', - color: theme.colors.black, + color: theme.colors.chateauBlue, paddingVertical: 10, }, }); diff --git a/src/modules/settings/NotificationRow.tsx b/src/modules/settings/NotificationRow.tsx index 4fc5c8f..2cb6cda 100644 --- a/src/modules/settings/NotificationRow.tsx +++ b/src/modules/settings/NotificationRow.tsx @@ -37,9 +37,9 @@ const NotificationRow = ({ expiryDate, showToast }: NotificationRowProps) => { accessibilityLabel={LABEL} value={hasPermission || false} onValueChange={handleToggle} - trackColor={{ false: theme.colors.betongGrayDarkened, true: theme.colors.goldenOrange }} + trackColor={{ false: theme.colors.chateauBlue05, true: theme.colors.goldenOrange }} thumbColor={theme.colors.white} - ios_backgroundColor={theme.colors.betongGrayDarkened} + ios_backgroundColor={theme.colors.chateauBlue05} /> } />