some divider styling

This commit is contained in:
Peter Cottle 2015-04-30 10:30:35 -07:00
parent 76710a896f
commit 6c89a22d74
4 changed files with 50 additions and 25 deletions

View file

@ -15,6 +15,8 @@ var SequenceSelectView = require('../native_react_views/SequenceSelectView');
var LevelSelectView = require('../native_react_views/LevelSelectView'); var LevelSelectView = require('../native_react_views/LevelSelectView');
var NUXView = require('../native_react_views/NUXView'); var NUXView = require('../native_react_views/NUXView');
var INITIAL_ROUTE = Routes.NUX;
var LearnGitBranching = React.createClass({ var LearnGitBranching = React.createClass({
_renderScene: function(route, navigator) { _renderScene: function(route, navigator) {
@ -32,7 +34,7 @@ var LearnGitBranching = React.createClass({
render: function() { render: function() {
return ( return (
<Navigator <Navigator
initialRoute={Routes.getRouteForID(Routes.NUX)} initialRoute={Routes.getRouteForID(INITIAL_ROUTE)}
renderScene={this._renderScene} renderScene={this._renderScene}
/> />
); );

View file

@ -28,23 +28,25 @@ var NUXView = React.createClass({
<HeaderSpacer /> <HeaderSpacer />
<View style={styles.container}> <View style={styles.container}>
<TerminalCardView> <TerminalCardView>
<View style={styles.welcomeTextContainer}> <View style={styles.textContainer}>
<Text style={styles.welcomeText}> <View style={styles.welcomeTextContainer}>
Welcome To... <Text style={styles.welcomeText}>
Welcome To...
</Text>
<Text style={styles.welcomeText}>
Learn Git Branching!
</Text>
</View>
<Text style={styles.introText}>
Learn Git Branching is the most interactive
and visual way to master Git.
</Text> </Text>
<Text style={styles.welcomeText}> <Text style={styles.introText}>
Learn Git Branching! With over 30 tutorials and levels, everyone from
absolute beginners to experienced Git wizards
should find something challenging and new.
</Text> </Text>
</View> </View>
<Text style={styles.introText}>
Learn Git Branching is the most interactive
and visual way to master Git.
</Text>
<Text style={styles.introText}>
With over 30 tutorials and levels, everyone from
absolute beginners to experienced Git wizards
should find something challenging and new.
</Text>
</TerminalCardView> </TerminalCardView>
<View style={styles.buttonContainer}> <View style={styles.buttonContainer}>
<NavButton <NavButton
@ -63,6 +65,9 @@ var NUXView = React.createClass({
}); });
var styles = StyleSheet.create({ var styles = StyleSheet.create({
textContainer: {
padding: 8,
},
buttonContainer: { buttonContainer: {
marginTop: 40, marginTop: 40,
}, },

View file

@ -6,6 +6,7 @@ var {
ScrollView, ScrollView,
StyleSheet, StyleSheet,
Text, Text,
TouchableHighlight,
View, View,
} = React; } = React;
@ -33,7 +34,7 @@ var SequenceSelectView = React.createClass({
<ScrollView style={styles.container}> <ScrollView style={styles.container}>
<View style={styles.headerSpacer} /> <View style={styles.headerSpacer} />
<TerminalCardView> <TerminalCardView>
<View> <View style={styles.terminalContainer}>
{Object.keys(Levels.levelSequences).map( {Object.keys(Levels.levelSequences).map(
sequenceID => this.renderSelector(sequenceID) sequenceID => this.renderSelector(sequenceID)
)} )}
@ -58,20 +59,38 @@ var SequenceSelectView = React.createClass({
var about = intl.getIntlKey(info, 'about'); var about = intl.getIntlKey(info, 'about');
return ( return (
<View> <TouchableHighlight underlayColor="#6E6E6E">
<Text style={styles.sequenceName}> <View>
{name} <View style={styles.textContainer}>
</Text> <Text style={styles.sequenceName}>
<Text style={styles.sequenceAbout}> {name}
{about} </Text>
</Text> <Text style={styles.sequenceAbout}>
</View> {about}
</Text>
</View>
<View style={styles.divider} />
</View>
</TouchableHighlight>
); );
} }
}); });
var styles = StyleSheet.create({ var styles = StyleSheet.create({
divider: {
height: 1,
marginBottom: 8,
backgroundColor: '#FFF'
},
terminalContainer: {
paddingTop: 8,
paddingBottom: 8,
},
textContainer: {
paddingLeft: 8,
paddingRight: 8,
},
sequenceName: assign({}, AppStyles.terminalTextStyle, { sequenceName: assign({}, AppStyles.terminalTextStyle, {
fontSize: 20, fontSize: 20,
}), }),

View file

@ -84,7 +84,6 @@ var styles = StyleSheet.create({
}, },
terminalTextContainer: { terminalTextContainer: {
padding: 12,
borderWidth: 1 / PixelRatio.get(), borderWidth: 1 / PixelRatio.get(),
borderColor: AppStyles.terminalBorder, borderColor: AppStyles.terminalBorder,
borderRadius: BORDER_RADIUS borderRadius: BORDER_RADIUS