Merge branch 'development' of github.com:GeekyAnts/NativeBase into development

Supriya Kalghatgi · Supriya Kalghatgi · commit e2a96d68d8e5 · 2018-07-19T15:53:32.000+05:30
diff --git a/src/basic/Tabs/DefaultTabBar.js b/src/basic/Tabs/DefaultTabBar.js
@@ -71,8 +71,8 @@ const DefaultTabBar = createReactClass({
           >
             <Text
               style={[
-                isTabActive ? activeTextStyle : textStyle,
-                { fontSize: tabFontSize }
+                { fontSize: tabFontSize },
+                isTabActive ? activeTextStyle : textStyle
               ]}
             >
               {name}
diff --git a/src/theme/components/Card.js b/src/theme/components/Card.js
@@ -19,7 +19,6 @@ export default (variables = variable) => {
     },
     marginVertical: 5,
     marginHorizontal: 2,
-    flex: 1,
     borderWidth: variables.borderWidth,
     borderRadius: variables.cardBorderRadius,
     borderColor: variables.cardBorderColor,

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ const DefaultTabBar = createReactClass({`
`71`	`71`	`>`
`72`	`72`	`<Text`
`73`	`73`	`style={[`
`74`		`- isTabActive ? activeTextStyle : textStyle,`
`75`		`- { fontSize: tabFontSize }`
	`74`	`+ { fontSize: tabFontSize },`
	`75`	`+ isTabActive ? activeTextStyle : textStyle`
`76`	`76`	`]}`
`77`	`77`	`>`
`78`	`78`	`{name}`