Skip to content

C
clone_excelso
Commit 06454572 authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek 

# Conflicts:
#	view/Account.js
parents bf45214c 94b50f86
Expand all Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 76 deletions
view/Account.js
View file @ 06454572
This diff is collapsed.
view/Home.js
View file @ 06454572
...@@ -351,7 +351,7 @@ class Home extends React.Component { ...@@ -351,7 +351,7 @@ class Home extends React.Component {
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>BALANCE</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>BALANCE</Text>
</View> </View>
<View style={{ flex: 0.7, alignItems:'center'}}> <View style={{ flex: 0.7, alignItems:'center'}}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.balance}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.balance}</Text>
</View> </View>
</View> </View>
...@@ -366,7 +366,7 @@ class Home extends React.Component { ...@@ -366,7 +366,7 @@ class Home extends React.Component {
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>POINTS</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>POINTS</Text>
</View> </View>
<View style={{ flex: 0.7,alignItems:'center' }}> <View style={{ flex: 0.7,alignItems:'center' }}>
<Text style={{ fontSize: 12, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.point}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.point}</Text>
</View> </View>
</View> </View>
</Card> </Card>
......
view/RewardDetail.js
View file @ 06454572
...@@ -93,7 +93,7 @@ class RewardDetail extends React.Component { ...@@ -93,7 +93,7 @@ class RewardDetail extends React.Component {
render() { render() {
// console.log(this.state.content) console.log(this.state.content)
return ( return (
<View style={styles.container}> <View style={styles.container}>
<ScrollView> <ScrollView>
...@@ -108,7 +108,7 @@ class RewardDetail extends React.Component { ...@@ -108,7 +108,7 @@ class RewardDetail extends React.Component {
<Text style={styles.text_expire}>EXPIRE DATE</Text> <Text style={styles.text_expire}>EXPIRE DATE</Text>
</View> </View>
<View style={{flex:0.5}}> <View style={{flex:0.5}}>
<Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 14, textAlign: 'center', marginBottom: 5, top: 5, paddingLeft:55 }}>{this.state.expire}</Text> <Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 14, textAlign: 'right', marginBottom: 5, top: 5, paddingRight:12}}>{this.state.expire}</Text>
</View> </View>
</View> </View>
...@@ -121,7 +121,8 @@ class RewardDetail extends React.Component { ...@@ -121,7 +121,8 @@ class RewardDetail extends React.Component {
<View <View
style={{ marginHorizontal: 20 }} style={{ marginHorizontal: 20 }}
> >
<HTML html={this.state.content} tagsStyles={{ p: { fontSize:12, color:'#838383', fontFamily: 'Gotham-Light'}, blockquote: { backgroundColor: "#f1f1f1", padding: 12, paddingBottom: 0, marginTop: 6 } }} />
<HTML html={this.state.content} tagsStyles={{ p: { fontSize:12, color:'#838383', fontFamily: 'Gotham-Light'}, li: { fontSize:12, color:'#838383', fontFamily: 'Gotham-Light' }, ul: { fontSize:12, color:'#838383', fontFamily: 'Gotham-Light', marginTop:10 }, blockquote: { backgroundColor: "#f1f1f1", padding: 12, paddingBottom: 0, marginTop: 6 } }} />
</View> </View>
</View> </View>
<View style={styles.content}> <View style={styles.content}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment