diff --git a/src/js/constants/Colors.js b/src/js/constants/AppStyles.js similarity index 51% rename from src/js/constants/Colors.js rename to src/js/constants/AppStyles.js index 2029bfdc..2d1ef06c 100644 --- a/src/js/constants/Colors.js +++ b/src/js/constants/AppStyles.js @@ -1,4 +1,4 @@ -module.exports = { +var AppStyles = { blueBackground: '#5cbcfc', terminalBackground: '#424242', terminalText: 'rgb(238, 238, 238)', @@ -6,3 +6,11 @@ module.exports = { terminalBorder: '#303030', terminalFontFamily: 'Courier', }; + +AppStyles.terminalTextStyle = { + color: AppStyles.terminalText, + fontFamily: AppStyles.terminalFontFamily, + fontWeight: 'bold', +}; + +module.exports = AppStyles; diff --git a/src/js/native_react_views/NUXView.js b/src/js/native_react_views/NUXView.js index d1e18afd..61942eaf 100644 --- a/src/js/native_react_views/NUXView.js +++ b/src/js/native_react_views/NUXView.js @@ -8,7 +8,7 @@ var { View, } = React; -var Colors = require('../constants/Colors'); +var AppStyles = require('../constants/AppStyles'); var TerminalCardView = require('../native_react_views/TerminalCardView'); var NavButton = require('../native_react_views/NavButton'); @@ -56,22 +56,14 @@ var NUXView = React.createClass({ ); } - }); -// TODO -- refactor this somewhere -var terminalTextStyle = { - color: Colors.terminalText, - fontFamily: Colors.terminalFontFamily, - fontWeight: 'bold', -}; - var styles = StyleSheet.create({ buttonContainer: { marginTop: 40, }, background: { - backgroundColor: Colors.blueBackground, + backgroundColor: AppStyles.blueBackground, flex: 1 }, container: { @@ -85,11 +77,11 @@ var styles = StyleSheet.create({ justifyContent: 'center', alignItems: 'center', }, - welcomeText: assign({}, terminalTextStyle, { + welcomeText: assign({}, AppStyles.terminalTextStyle, { fontSize: 24, marginBottom: 8 }), - introText: assign({}, terminalTextStyle, { + introText: assign({}, AppStyles.terminalTextStyle, { marginTop: 8, flex: 1, marginBottom: 8 diff --git a/src/js/native_react_views/SequenceSelectView.js b/src/js/native_react_views/SequenceSelectView.js index 1a5e8181..4b558eae 100644 --- a/src/js/native_react_views/SequenceSelectView.js +++ b/src/js/native_react_views/SequenceSelectView.js @@ -8,7 +8,7 @@ var { View, } = React; -var Colors = require('../constants/Colors'); +var AppStyles = require('../constants/AppStyles'); var SequenceSelectView = React.createClass({ @@ -40,7 +40,7 @@ var SequenceSelectView = React.createClass({ var styles = StyleSheet.create({ background: { - backgroundColor: Colors.blueBackground, + backgroundColor: AppStyles.blueBackground, flex: 1 }, headerSpacer: { diff --git a/src/js/native_react_views/TerminalCardView.js b/src/js/native_react_views/TerminalCardView.js index b70f7c6c..ab5f411c 100644 --- a/src/js/native_react_views/TerminalCardView.js +++ b/src/js/native_react_views/TerminalCardView.js @@ -7,7 +7,7 @@ var { View, } = React; -var Colors = require('../constants/Colors'); +var AppStyles = require('../constants/AppStyles'); var TerminalCardView = React.createClass({ propTypes: { @@ -52,7 +52,7 @@ var buttonStyle = { var styles = StyleSheet.create({ terminalHeader: { height: 16, - backgroundColor: Colors.terminalHeader, + backgroundColor: AppStyles.terminalHeader, borderRadius: BORDER_RADIUS, flexDirection: 'row', justifyContent: 'flex-start', @@ -73,7 +73,7 @@ var styles = StyleSheet.create({ }), terminalWindow: { - backgroundColor: Colors.terminalBackground, + backgroundColor: AppStyles.terminalBackground, borderRadius: BORDER_RADIUS, shadowOpacity: 0.5, shadowRadius: 4, @@ -86,13 +86,13 @@ var styles = StyleSheet.create({ terminalTextContainer: { padding: 12, borderWidth: 1 / PixelRatio.get(), - borderColor: Colors.terminalBorder, + borderColor: AppStyles.terminalBorder, borderRadius: BORDER_RADIUS }, terminalText: { - color: Colors.terminalText, - fontFamily: Colors.terminalFontFamily, + color: AppStyles.terminalText, + fontFamily: AppStyles.terminalFontFamily, fontSize: 16, fontWeight: 'bold' },