Skip to content

C
clone_excelso
Commit c039fa8e 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

parents 6a9b3732 7f8bd94c
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 14 deletions
view/MenuConfirmation.js
View file @ c039fa8e
......@@ -227,8 +227,8 @@ class MenuConfirmation extends React.Component {
{
this.props.type_pickup == true ? (
<View style={{ flex: 0.7, justifyContent: 'center' }}>
<Text style={{ textAlign: 'left', fontSize: 14, fontFamily: 'Gotham-Black', color: '#838383' }}>Excelso {this.props.name_outlet}</Text>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>Excelso {this.props.outlet_detailadress}</Text>
<Text style={{ textAlign: 'left', fontSize: 14, fontFamily: 'Gotham-Black', color: '#838383' }}>{this.props.name_outlet}</Text>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color: '#838383' }}>{this.props.outlet_detailadress}</Text>
</View>
) : (
<View style={{ flex: 0.7, justifyContent: 'center' }}>
......
view/NewsDetail.js
View file @ c039fa8e
......@@ -42,6 +42,7 @@ export default class NewsDetail extends React.Component {
}
render() {
// console.log(this.state.content)
return (
<View style={styles.container}>
<ScrollView style={styles.body}>
......@@ -50,8 +51,16 @@ export default class NewsDetail extends React.Component {
</View>
<View style={styles.content}>
<Text style={styles.title}>{this.state.title}</Text>
<View style={{backgroundColor: '#adadad', height: 1.5, flex: 1, marginBottom: 5}} />
<HTML html={this.state.content} tagsStyles={{ p: {fontFamily: 'Gotham-Light', marginTop: 8, marginBottom: 8}, blockquote: { backgroundColor: "#f1f1f1", padding: 12, paddingBottom: 0, marginTop: 6 } }}/>
<View style={{ backgroundColor: '#adadad', height: 1.5, flex: 1, marginBottom: 5 }} />
<HTML html={this.state.content} tagsStyles={{
p: { fontSize: 12, color: '#838383', fontFamily: 'Gotham-Light' },
blockquote: { backgroundColor: "#f1f1f1", padding: 12, paddingBottom: 0, marginTop: 0 },
li: { fontSize: 12, color: '#838383', fontFamily: 'Gotham-Light', marginBottom : 0 },
ul: { fontSize: 12, color: '#838383', fontFamily: 'Gotham-Light', marginVertical: 5, marginBottom : -10 },
}}
ignoredTags={['br']}
ignoredStyles={['font-family','&nbsp;', '&amp;']} />
</View>
</ScrollView>
</View>
......@@ -61,7 +70,7 @@ export default class NewsDetail extends React.Component {
const styles = StyleSheet.create({
container:{
container: {
flex: 1,
backgroundColor: 'white',
},
......@@ -70,7 +79,7 @@ const styles = StyleSheet.create({
paddingHorizontal: 5,
flexDirection: 'row',
backgroundColor: '#CFB368',
alignItems : 'center'
alignItems: 'center'
},
headerTitle: {
flex: 1,
......
view/ShoppingCart.js
View file @ c039fa8e
......@@ -445,8 +445,8 @@ class ShoppingCart extends React.Component {
this.props.type_pickup == true ? (
<View style={{ margin: 5, padding: 10 }}>
<Text style={{ textAlign: 'center', fontFamily: 'Gotham-Black', fontSize: 12, color: 'grey' }}>YOU WILL PICKUP YOUR ORDER AT</Text>
<Text style={{ textAlign: 'center', fontSize: 14, top: 5, fontFamily: 'Gotham-Black', color: 'grey' }}>Excelso {this.props.name_outlet}</Text>
<Text style={{ textAlign: 'center', fontSize: 12, top: 5, fontFamily: 'Gotham-Light', color: 'grey' }}>Excelso {this.props.outlet_detailadress}</Text>
<Text style={{ textAlign: 'center', fontSize: 14, top: 5, fontFamily: 'Gotham-Black', color: 'grey' }}>{this.props.name_outlet}</Text>
<Text style={{ textAlign: 'center', fontSize: 12, top: 5, fontFamily: 'Gotham-Light', color: 'grey' }}>{this.props.outlet_detailadress}</Text>
</View>
) : (
<View style={{ margin: 5, padding: 10 }}>
......
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