reverted changes to files that aren't apart of the #13 issue

This commit is contained in:
autun12 2019-04-14 13:56:31 -05:00
parent ebcb52ba5e
commit 63ac7ae18d
No known key found for this signature in database
GPG Key ID: C184B80D045EA3C8
4 changed files with 6 additions and 11 deletions

View File

@ -57,13 +57,7 @@ class Button extends React.Component {
onPress={onPress} onPress={onPress}
accessibilityLabel={accessibilityLabel} accessibilityLabel={accessibilityLabel}
> >
<Text <Text style={[styles.text, main && styles.textMain, disabled && styles.textDisabled]}>
style={[
styles.text,
main && styles.textMain,
disabled && styles.textDisabled,
]}
>
{title} {title}
</Text> </Text>
</TouchableHighlight> </TouchableHighlight>

View File

@ -5,10 +5,11 @@ import {
StyleSheet, StyleSheet,
Text, Text,
View, View,
TextInput,
TouchableOpacity, TouchableOpacity,
} from 'react-native' } from 'react-native'
import TextInput from './TextInput'
// Theme // Theme
import theme from '../theme' import theme from '../theme'
@ -20,7 +21,6 @@ const styles = StyleSheet.create({
alignItems: 'center', alignItems: 'center',
flexWrap: 'wrap', flexWrap: 'wrap',
justifyContent: 'center', justifyContent: 'center',
backgroundColor: colors.main.white.rgb,
borderRadius: 8, borderRadius: 8,
marginVertical: 16, marginVertical: 16,
marginHorizontal: 16, marginHorizontal: 16,
@ -37,7 +37,7 @@ const styles = StyleSheet.create({
}, },
}) })
class SearchInput extends React.Component { class SearchInput extends TextInput {
render() { render() {
const { text } = this.props const { text } = this.props

View File

@ -54,6 +54,7 @@ storiesOf('TextInput', module)
label="Textarea label" label="Textarea label"
multiLine={true} multiLine={true}
autoFocus={false} autoFocus={false}
placeholder={'Placeholder'}
/> />
</View> </View>
)) ))

View File

@ -10,7 +10,7 @@ export default {
tera: '32px', tera: '32px',
peta: '40px', peta: '40px',
exa: '48px', exa: '48px',
zetta: '56px', zetta: '56px'
}, },
colors: { colors: {