@project-r/styleguide
Advanced tools
Comparing version 0.2.8 to 0.2.9
@@ -24,4 +24,4 @@ 'use strict'; | ||
verticalAlign: 'bottom', | ||
padding: '10px 30px 10px 30px', | ||
minWidth: 200, | ||
padding: '10px 20px 10px 20px', | ||
minWidth: 160, | ||
textAlign: 'center', | ||
@@ -84,2 +84,3 @@ textDecoration: 'none', | ||
block = _ref.block, | ||
style = _ref.style, | ||
disabled = _ref.disabled, | ||
@@ -89,8 +90,8 @@ sim = _ref.simulate; | ||
var simulations = sim ? (0, _glamor.simulate)(sim) : {}; | ||
var style = (0, _glamor.merge)(fieldStyle, primary && primaryStyle, block && blockStyle, big && bigStyle); | ||
var styles = (0, _glamor.merge)(fieldStyle, primary && primaryStyle, block && blockStyle, big && bigStyle); | ||
return _react2.default.createElement( | ||
'button', | ||
_extends({ onClick: onClick, type: type, disabled: disabled | ||
}, style, simulations), | ||
_extends({ onClick: onClick, type: type, style: style, disabled: disabled | ||
}, styles, simulations), | ||
children | ||
@@ -97,0 +98,0 @@ ); |
{ | ||
"name": "@project-r/styleguide", | ||
"version": "0.2.8", | ||
"version": "0.2.9", | ||
"dependencies": { | ||
@@ -5,0 +5,0 @@ "react-autocomplete": "^1.4.1" |
@@ -8,4 +8,4 @@ import React from 'react' | ||
verticalAlign: 'bottom', | ||
padding: '10px 30px 10px 30px', | ||
minWidth: 200, | ||
padding: '10px 20px 10px 20px', | ||
minWidth: 160, | ||
textAlign: 'center', | ||
@@ -61,5 +61,5 @@ textDecoration: 'none', | ||
const Button = ({onClick, type, children, primary, big, block, disabled, simulate: sim}) => { | ||
const Button = ({onClick, type, children, primary, big, block, style, disabled, simulate: sim}) => { | ||
const simulations = sim ? simulate(sim) : {} | ||
const style = merge( | ||
const styles = merge( | ||
fieldStyle, | ||
@@ -72,4 +72,4 @@ primary && primaryStyle, | ||
return ( | ||
<button onClick={onClick} type={type} disabled={disabled} | ||
{...style} | ||
<button onClick={onClick} type={type} style={style} disabled={disabled} | ||
{...styles} | ||
{...simulations}> | ||
@@ -76,0 +76,0 @@ {children} |
9442393
1867