Apply complete styling to the Badge text

deep-coder · Nov 8, 2016 · 7ddca73 · 7ddca73
2 parents 0bf8d6f + 8629392
commit 7ddca73
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Components/Widgets/Badge.js b/Components/Widgets/Badge.js
@@ -46,11 +46,18 @@ export default class BadgeNB extends NativeBaseComponent {
     }
     render() {
         return(
+<<<<<<< HEAD
             <View ref={c => this._root = c} {...this.prepareRootProps()}>
                 <Text style={{ color: (this.props.textStyle && this.props.textStyle.color) ? this.props.textStyle.color : this.getTheme().badgeColor,
+=======
+            <View {...this.prepareRootProps()}>
+                <Text style={[ this.props.textStyle, {
+                                color: (this.props.textStyle && this.props.textStyle.color) ? this.props.textStyle.color : this.getTheme().badgeColor,
+>>>>>>> 8629392d4ad27c911011618f496c993296db2f67
                                 fontSize: (this.props.textStyle && this.props.textStyle.fontSize) ? this.props.textStyle.fontSize : this.getTheme().fontSizeBase,
                                 lineHeight: (this.props.textStyle && this.props.textStyle.lineHeight) ? this.props.textStyle.lineHeight : this.getTheme().lineHeight-1,
-                                textAlign: 'center'}}>{this.props.children}
+                                textAlign: 'center'
+                            } ]}>{this.props.children}
                 </Text>
             </View>
         );