Merge branch 'master' of github.com:GeekyAnts/NativeBase

Sankhadeep · Sankhadeep · commit 891d55798ae9 · 2016-07-25T19:20:18.000+05:30
diff --git a/Components/Widgets/Content.js b/Components/Widgets/Content.js
@@ -24,8 +24,10 @@ export default class Content extends NativeBaseComponent {
 	}
 
 	render() {
+		const contentContainerStyle = this.props.contentContainerStyle || {};
+		contentContainerStyle.padding = (this.props.padder) ? this.getTheme().contentPadding : 0;
 		return(
-			<ScrollView {...this.prepareRootProps()} contentContainerStyle={{padding: (this.props.padder) ? this.getTheme().contentPadding : 0}}>{this.props.children}</ScrollView>
+			<ScrollView {...this.prepareRootProps()} contentContainerStyle={contentContainerStyle}>{this.props.children}</ScrollView>
 		);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,10 @@ export default class Content extends NativeBaseComponent {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`render() {`
	`27`	`+ const contentContainerStyle = this.props.contentContainerStyle \|\| {};`
	`28`	`+ contentContainerStyle.padding = (this.props.padder) ? this.getTheme().contentPadding : 0;`
`27`	`29`	`return(`
`28`		`- <ScrollView {...this.prepareRootProps()} contentContainerStyle={{padding: (this.props.padder) ? this.getTheme().contentPadding : 0}}>{this.props.children}</ScrollView>`
	`30`	`+ <ScrollView {...this.prepareRootProps()} contentContainerStyle={contentContainerStyle}>{this.props.children}</ScrollView>`
`29`	`31`	`);`
`30`	`32`	`}`
`31`	`33`	`}`