diff --git a/components/common/app-page.js b/components/common/app-page.js index 2e7027d37d0d5b7db4aa1a3ae5db048e036d4b52..f8b3e93d8e505666ff2dde321498be93ebbf627f 100644 --- a/components/common/app-page.js +++ b/components/common/app-page.js @@ -4,7 +4,7 @@ import { ScrollView, StyleSheet } from 'react-native' import AppText from '../common/app-text' -import { Containers, Typography } from '../../styles/redesign' +import { Colors, Fonts, Sizes, Spacing, Typography } from '../../styles/redesign' const AppPage = ({ children, title }) => { return( @@ -22,10 +22,16 @@ AppPage.propTypes = { const styles = StyleSheet.create({ container: { - ...Containers.page + backgroundColor: Colors.tourquiseLight, + flex: 1 }, title: { - ...Typography.pageTitle + alignSelf: 'center', + fontFamily: Fonts.bold, + fontWeight: '700', + fontSize: Sizes.title, + marginHorizontal: Spacing.base, + ...Typography.title } }) diff --git a/styles/containers.js b/styles/containers.js index 1d96f0e9e8c412576f39f899dbe5f7c9f9d534af..d50910e090a7b76c8c37570338c9deb6ff6eb58b 100644 --- a/styles/containers.js +++ b/styles/containers.js @@ -1,13 +1,7 @@ -import Colors from './colors' - export default { centerItems: { alignItems: 'center', flex: 1, justifyContent: 'center' - }, - page: { - backgroundColor: Colors.tourquiseLight, - flex: 1 } } \ No newline at end of file diff --git a/styles/typography.js b/styles/typography.js index d567c3221d560cdc79b148bf6932c6f37ee0a423..5539b6ae4b2cc640a5bc3fda2b8e9cdaff4d6f29 100644 --- a/styles/typography.js +++ b/styles/typography.js @@ -17,13 +17,6 @@ export default { fontFamily: fonts.main, fontSize: sizes.base }, - pageTitle: { - alignSelf: 'center', - fontFamily: fonts.bold, - fontWeight: '700', - fontSize: sizes.title, - marginHorizontal: Spacing.base, - }, title: { color: Colors.purple, marginVertical: Spacing.large