Skip to content
Snippets Groups Projects
Commit 644b1e1a authored by Julia Friesel's avatar Julia Friesel
Browse files

Merge branch 'fonts-on-home-screen' into 'master'

Use same font for more, less and phase.

See merge request bloodyhealth/drip!150
parents 1469dea6 008d2186
No related branches found
No related tags found
No related merge requests found
...@@ -118,9 +118,9 @@ export default class Home extends Component { ...@@ -118,9 +118,9 @@ export default class Home extends Component {
</AppTextLight> </AppTextLight>
</View> </View>
{this.state.phase && {this.state.phase &&
<AppTextLight> <AppText>
{`${labels.phase(this.state.phase)} (${this.state.status})`} {`${labels.phase(this.state.phase)} (${this.state.status})`}
</AppTextLight> </AppText>
} }
{this.state.showMore && {this.state.showMore &&
<AppText styles={styles.paragraph}> <AppText styles={styles.paragraph}>
...@@ -147,7 +147,7 @@ export default class Home extends Component { ...@@ -147,7 +147,7 @@ export default class Home extends Component {
}]} }]}
> >
<View style={{alignItems: 'center'}}> <View style={{alignItems: 'center'}}>
<AppTextLight>{shared.more}</AppTextLight> <AppText>{shared.more}</AppText>
<Icon name='chevron-thin-down' /> <Icon name='chevron-thin-down' />
</View> </View>
</TouchableHighlight> </TouchableHighlight>
...@@ -162,7 +162,7 @@ export default class Home extends Component { ...@@ -162,7 +162,7 @@ export default class Home extends Component {
}]} }]}
> >
<View style={{alignItems: 'center'}}> <View style={{alignItems: 'center'}}>
<AppTextLight>{shared.less}</AppTextLight> <AppText>{shared.less}</AppText>
<Icon name='chevron-thin-down' /> <Icon name='chevron-thin-down' />
</View> </View>
</TouchableHighlight> </TouchableHighlight>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment