Merge branch '386-bug-fertility-text-is-missing-on-homescreen' into 'master'
Make sure fertility text is displayed on home screen Closes #386 See merge request bloodyhealth/drip!228
This commit is contained in:
+3
-5
@@ -38,7 +38,7 @@ const HomeElement = ({ children, onPress, buttonColor, buttonLabel }) => {
|
|||||||
</View>
|
</View>
|
||||||
|
|
||||||
<View style={{paddingLeft: 15}}>
|
<View style={{paddingLeft: 15}}>
|
||||||
{children[2]}
|
{children.slice(2)}
|
||||||
<Button
|
<Button
|
||||||
style={styles.homeButton}
|
style={styles.homeButton}
|
||||||
onPress={ onPress }
|
onPress={ onPress }
|
||||||
@@ -137,11 +137,9 @@ export default class Home extends Component {
|
|||||||
{`${labels.phase(phase)} (${status})`}
|
{`${labels.phase(phase)} (${status})`}
|
||||||
</AppText>
|
</AppText>
|
||||||
}
|
}
|
||||||
<View>
|
<AppText style={styles.homeDescriptionText}>
|
||||||
<AppText styles={styles.homeDescriptionText}>
|
{ `${statusText} Visit ${links.wiki.url}.` }
|
||||||
{ `${statusText} ${links.wiki.url}.` }
|
|
||||||
</AppText>
|
</AppText>
|
||||||
</View>
|
|
||||||
</HomeElement>
|
</HomeElement>
|
||||||
</View>
|
</View>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|||||||
+1
-1
@@ -123,7 +123,7 @@ export default StyleSheet.create({
|
|||||||
marginBottom: defaultBottomMargin,
|
marginBottom: defaultBottomMargin,
|
||||||
},
|
},
|
||||||
homeElement: {
|
homeElement: {
|
||||||
marginBottom: 40,
|
marginBottom: 30,
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
},
|
},
|
||||||
homeIconTextWrapper: {
|
homeIconTextWrapper: {
|
||||||
|
|||||||
Reference in New Issue
Block a user