Update home page with more color contrast for grey
This commit is contained in:
+9
-6
@@ -74,24 +74,24 @@ class Home extends Component {
|
|||||||
{this.cycleDayNumber && (
|
{this.cycleDayNumber && (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<AppText style={styles.whiteText}>{cycleDayText}</AppText>
|
<AppText style={styles.whiteText}>{cycleDayText}</AppText>
|
||||||
<AppText>{labels.cycleDay}</AppText>
|
<AppText style={styles.tourquiseText}>{labels.cycleDay}</AppText>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
)}
|
)}
|
||||||
{!this.cycleDayNumber && <AppText>{cycleDayText}</AppText>}
|
{!this.cycleDayNumber && <AppText>{cycleDayText}</AppText>}
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.line}>
|
<View style={styles.line}>
|
||||||
{!phase && <AppText>{phaseText}</AppText>}
|
{!phase && <AppText style={styles.tourquiseText}>{phaseText}</AppText>}
|
||||||
{phase && (
|
{phase && (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<AppText style={styles.whiteText}>{phaseText}</AppText>
|
<AppText style={styles.whiteText}>{phaseText}</AppText>
|
||||||
<AppText>{labels.cyclePhase}</AppText>
|
<AppText style={styles.tourquiseText}>{labels.cyclePhase}</AppText>
|
||||||
<AppText>{status}</AppText>
|
<AppText style={styles.tourquiseText}>{status}</AppText>
|
||||||
<Asterisk />
|
<Asterisk />
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.line}>
|
<View style={styles.line}>
|
||||||
<AppText>{prediction}</AppText>
|
<AppText style={styles.tourquiseText}>{prediction}</AppText>
|
||||||
</View>
|
</View>
|
||||||
<Button isCTA isSmall={false} onPress={this.navigateToCycleDayView}>
|
<Button isCTA isSmall={false} onPress={this.navigateToCycleDayView}>
|
||||||
{labels.addData}
|
{labels.addData}
|
||||||
@@ -99,7 +99,7 @@ class Home extends Component {
|
|||||||
{phase && (
|
{phase && (
|
||||||
<View style={styles.line}>
|
<View style={styles.line}>
|
||||||
<Asterisk />
|
<Asterisk />
|
||||||
<AppText linkStyle={styles.whiteText}>{statusText}</AppText>
|
<AppText style={styles.tourquiseText} linkStyle={styles.whiteText}>{statusText}</AppText>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
@@ -134,6 +134,9 @@ const styles = StyleSheet.create({
|
|||||||
fontSize: Sizes.huge,
|
fontSize: Sizes.huge,
|
||||||
marginVertical: Spacing.base,
|
marginVertical: Spacing.base,
|
||||||
},
|
},
|
||||||
|
tourquiseText: {
|
||||||
|
color: Colors.tourquise,
|
||||||
|
},
|
||||||
whiteText: {
|
whiteText: {
|
||||||
color: 'white'
|
color: 'white'
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -13,12 +13,12 @@ const orangeColor = '#bc6642'
|
|||||||
const mintColor = '#6ca299'
|
const mintColor = '#6ca299'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
greyDark: '#A5A5A5',
|
greyDark: '#555',
|
||||||
grey: '#D2D2D2',
|
grey: '#888',
|
||||||
greyLight: '#F2F2F2',
|
greyLight: '#CCC',
|
||||||
orange: '#F38337',
|
orange: '#F38337',
|
||||||
purple: '#3A2671',
|
purple: '#3A2671',
|
||||||
purpleLight: '#5D4F8A',
|
purpleLight: '#938EB2',
|
||||||
tourquiseDark: '#69CBC1',
|
tourquiseDark: '#69CBC1',
|
||||||
tourquise: '#CFECEA',
|
tourquise: '#CFECEA',
|
||||||
tourquiseLight: '#E9F2ED',
|
tourquiseLight: '#E9F2ED',
|
||||||
|
|||||||
Reference in New Issue
Block a user