diff options
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/about.coffee | 3 | ||||
-rw-r--r-- | app/assets/javascripts/components/components/button.jsx | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/app/assets/javascripts/about.coffee b/app/assets/javascripts/about.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/about.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx index 6f7ace323..fe36d40c5 100644 --- a/app/assets/javascripts/components/components/button.jsx +++ b/app/assets/javascripts/components/components/button.jsx @@ -19,8 +19,29 @@ const Button = React.createClass({ }, render () { + const style = { + fontFamily: 'Roboto', + display: this.props.block ? 'block' : 'inline-block', + width: this.props.block ? '100%' : 'auto', + position: 'relative', + boxSizing: 'border-box', + textAlign: 'center', + border: '10px none', + color: '#fff', + fontSize: '14px', + fontWeight: '500', + letterSpacing: '0', + textTransform: 'uppercase', + padding: '0 16px', + height: '36px', + cursor: 'pointer', + lineHeight: '36px', + borderRadius: '4px', + textDecoration: 'none' + }; + return ( - <button className={`button ${this.props.secondary ? 'button-secondary' : ''}`} disabled={this.props.disabled} onClick={this.handleClick} style={{ fontFamily: 'Roboto', display: this.props.block ? 'block' : 'inline-block', width: this.props.block ? '100%' : 'auto', position: 'relative', boxSizing: 'border-box', textAlign: 'center', border: '10px none', color: '#fff', fontSize: '14px', fontWeight: '500', letterSpacing: '0', textTransform: 'uppercase', padding: '0 16px', height: '36px', cursor: 'pointer', lineHeight: '36px', borderRadius: '4px', textDecoration: 'none' }}> + <button className={`button ${this.props.secondary ? 'button-secondary' : ''}`} disabled={this.props.disabled} onClick={this.handleClick} style={style}> {this.props.text || this.props.children} </button> ); |