diff --git a/src/modules/about/About.js b/src/modules/about/About.js index 1c0d42b..a82533e 100644 --- a/src/modules/about/About.js +++ b/src/modules/about/About.js @@ -77,11 +77,11 @@ const About = () => ( Følg oss på - + Facebook - + Instagram @@ -155,12 +155,12 @@ const styles = StyleSheet.create({ header: { fontSize: 20, fontWeight: 'bold', - color: '#000', + color: theme.colors.neufBlack, textAlign: 'center', }, paragraph: { fontSize: 16, - color: '#000', + color: theme.colors.neufBlack, paddingBottom: 10, lineHeight: 25, }, diff --git a/src/modules/events/EventDetail.js b/src/modules/events/EventDetail.js index f86b8e9..3602797 100644 --- a/src/modules/events/EventDetail.js +++ b/src/modules/events/EventDetail.js @@ -223,7 +223,7 @@ const styles = StyleSheet.create({ title: { fontSize: 20, fontWeight: 'bold', - color: '#000', + color: theme.colors.neufBlack, }, card: theme.card, image: { @@ -232,7 +232,7 @@ const styles = StyleSheet.create({ }, time: { fontSize: 14, - color: '#666', + color: theme.colors.lightText, }, metaInner: { flexDirection: 'row', @@ -245,14 +245,14 @@ const styles = StyleSheet.create({ marginVertical: 8, }, metaText: { - color: '#000', + color: theme.colors.neufBlack, }, metaSubtitle: { - color: '#666', + color: theme.colors.neufBlack, }, content: { borderTopWidth: StyleSheet.hairlineWidth, - borderColor: '#ccc', + borderColor: theme.colors.neufGray, marginTop: 8, paddingTop: 10, }, @@ -269,7 +269,7 @@ const styles = StyleSheet.create({ day: { paddingTop: 5, fontSize: 20, - color: '#000', + color: theme.colors.neufBlack, textAlign: 'center', }, month: { @@ -278,8 +278,8 @@ const styles = StyleSheet.create({ }, year: { fontSize: 9, - color: '#fff', - backgroundColor: '#f58220', + color: theme.colors.neufWhite, + backgroundColor: theme.colors.neufOrange, textAlign: 'center', paddingRight: 20, paddingBottom: 3, diff --git a/src/modules/events/EventList.js b/src/modules/events/EventList.js index 28deb9f..7e761f6 100644 --- a/src/modules/events/EventList.js +++ b/src/modules/events/EventList.js @@ -40,7 +40,7 @@ const EventList = () => { {_formatTime(item.start_time)} - + @@ -51,7 +51,7 @@ const EventList = () => { const Footer = () => !loading && ( - + ); @@ -93,23 +93,23 @@ export default EventList; const styles = StyleSheet.create({ listItem: { - backgroundColor: 'white', + backgroundColor: theme.colors.neufWhite, paddingTop: 8, paddingBottom: 12, paddingLeft: 12, paddingRight: 12, borderBottomWidth: 1, - borderBottomColor: '#ccc', + borderBottomColor: theme.colors.neufGray, }, listItemTitle: { fontSize: 16, }, listItemTime: { fontSize: 14, - color: '#666', + color: theme.colors.lightText, }, sectionHeader: { - backgroundColor: 'white', + backgroundColor: theme.colors.neufWhite, ...Platform.select({ ios: { marginBottom: -8 }, }), diff --git a/src/modules/login/Login.js b/src/modules/login/Login.js index 3905ab5..da434a1 100644 --- a/src/modules/login/Login.js +++ b/src/modules/login/Login.js @@ -50,7 +50,7 @@ const Login = () => { > Glemt passord? - {isLoggingIn && } + {isLoggingIn && } ); diff --git a/src/modules/membership/Membership.js b/src/modules/membership/Membership.js index 517e281..7b32403 100644 --- a/src/modules/membership/Membership.js +++ b/src/modules/membership/Membership.js @@ -13,7 +13,7 @@ const Membership = () => { if (isFetchingUserData) { return ( - + ); } @@ -33,7 +33,7 @@ const styles = StyleSheet.create({ paragraph: { textAlign: 'center', fontSize: 16, - color: '#000', + color: theme.colors.neufBlack, paddingBottom: 10, lineHeight: 25, }, @@ -43,7 +43,7 @@ const styles = StyleSheet.create({ }, em: { fontSize: 16, - color: '#000', + color: theme.colors.neufBlack, fontStyle: 'italic', textAlign: 'center', marginVertical: 10, @@ -52,14 +52,14 @@ const styles = StyleSheet.create({ textAlign: 'center', fontWeight: 'bold', fontSize: 20, - color: '#000', + color: theme.colors.neufBlack, paddingVertical: 10, lineHeight: 25, }, header: { fontSize: 16, fontWeight: 'bold', - color: '#000', + color: theme.colors.neufBlack, lineHeight: 25, paddingLeft: 2, }, diff --git a/src/modules/membership/MembershipInfo.js b/src/modules/membership/MembershipInfo.js index 6c69bd1..1f393a9 100644 --- a/src/modules/membership/MembershipInfo.js +++ b/src/modules/membership/MembershipInfo.js @@ -38,7 +38,7 @@ const styles = StyleSheet.create({ paragraph: { textAlign: 'center', fontSize: 16, - color: '#000', + color: theme.colors.neufBlack, paddingBottom: 10, lineHeight: 25, }, @@ -48,7 +48,7 @@ const styles = StyleSheet.create({ }, em: { fontSize: 16, - color: '#000', + color: theme.colors.neufBlack, fontStyle: 'italic', textAlign: 'center', marginVertical: 10, @@ -57,14 +57,14 @@ const styles = StyleSheet.create({ textAlign: 'center', fontWeight: 'bold', fontSize: 20, - color: '#000', + color: theme.colors.neufBlack, paddingVertical: 10, lineHeight: 25, }, header: { fontSize: 16, fontWeight: 'bold', - color: '#000', + color: theme.colors.neufBlack, lineHeight: 25, paddingLeft: 2, }, diff --git a/src/modules/membership/Proof.js b/src/modules/membership/Proof.js index 9a538c2..49b06cc 100644 --- a/src/modules/membership/Proof.js +++ b/src/modules/membership/Proof.js @@ -64,7 +64,7 @@ const PurchaseButton = ({ user, isChargingMembership, isLoadingMembershipType, o return ( - {isChargingMembership && } + {isChargingMembership && } - {isRegisteringUser && } + {isRegisteringUser && } ); diff --git a/src/theme.js b/src/theme.js index 32ab099..c946cfa 100644 --- a/src/theme.js +++ b/src/theme.js @@ -2,8 +2,17 @@ import { Platform } from 'react-native'; import { Colors } from 'react-native-ui-lib'; const colors = { - primary: '#f58220', danger: '#d9534f', + success: '#5cb85c', + lightText: '#666', + neufPurple: '#720328', + neufPink: '#CD96AB', + neufGray: '#E5E2D7', + neufOrange: '#f58220', + neufBeige: '#F8BC90', + neufBlue: '#0A0F6D', + neufWhite: '#FFFFFF', + neufBlack: '#161516', }; const card = { @@ -20,11 +29,11 @@ const card = { }), padding: 8, margin: 8, - backgroundColor: '#fff', + backgroundColor: colors.neufWhite, }; export function loadTheme() { - Colors.loadDesignTokens({ primaryColor: colors.primary }); + Colors.loadDesignTokens({ primaryColor: colors.neufOrange }); } export default { card, colors };