From e2f34a5eea79edbe00e6d8370f00e13a9f641240 Mon Sep 17 00:00:00 2001 From: Julia Friesel <julia.friesel@gmail.com> Date: Thu, 27 Sep 2018 18:08:23 +0200 Subject: [PATCH] Change secondary color --- android/app/src/main/res/values/colors.xml | 2 +- styles/index.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index ecedb42e..6f1943f1 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -8,5 +8,5 @@ <color name="colorPrimaryDark">#000D19</color> <!-- a secondary color for controls like checkboxes and text fields --> - <color name="colorAccent">#351c4d</color> + <color name="colorAccent">#4FAFA7</color> </resources> \ No newline at end of file diff --git a/styles/index.js b/styles/index.js index 9b0fa3a7..c1ba8f2e 100644 --- a/styles/index.js +++ b/styles/index.js @@ -1,7 +1,7 @@ import { StyleSheet } from 'react-native' export const primaryColor = '#000D19' -export const secondaryColor = '#351c4d' +export const secondaryColor = '#4FAFA7' export const secondaryColorLight = '#91749d' export const fontOnPrimaryColor = 'white' export const shadesOfRed = [ @@ -11,13 +11,20 @@ export const shadesOfRed = [ '#c3000d' ] // light to dark +const fontRegular = 'Prompt-Light' +const fontLight = 'Prompt-Thin' + +const regularSize = 16 + const defaultBottomMargin = 5 const defaultIndentation = 10 const defaultTopMargin = 10 export default StyleSheet.create({ appText: { - color: 'black' + color: 'black', + fontFamily: fontRegular, + fontSize: regularSize }, paragraph: { marginBottom: defaultBottomMargin @@ -43,7 +50,7 @@ export default StyleSheet.create({ }, dateHeader: { fontSize: 30, - fontFamily: 'Prompt-Thin', + fontFamily: fontLight, color: fontOnPrimaryColor, textAlign: 'center', }, @@ -128,7 +135,8 @@ export default StyleSheet.create({ paddingVertical: 15 }, menuText: { - color: fontOnPrimaryColor + color: fontOnPrimaryColor, + fontFamily: fontLight }, menuTextInActive: { color: 'lightgrey' -- GitLab