diff options
author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-21 00:31:47 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-20 17:31:47 +0200 |
commit | 2e112e240666b62b8c3d4fa201fb24b841f6c92b (patch) | |
tree | f95f2eb5ae8156c10bf16894919d0ba5e3f34096 /app/javascript/mastodon/components/button.js | |
parent | 812fe90ecaef58f1dbe16c3fdfea79e14e7bbc9d (diff) |
Improve eslint rules (#3147)
* Add semi to ESLint rules * Add padded-blocks to ESLint rules * Add comma-dangle to ESLint rules * add config/webpack and storyboard * add streaming/ * yarn test:lint -- --fix
Diffstat (limited to 'app/javascript/mastodon/components/button.js')
-rw-r--r-- | app/javascript/mastodon/components/button.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/components/button.js b/app/javascript/mastodon/components/button.js index 7612bd233..cc6482cde 100644 --- a/app/javascript/mastodon/components/button.js +++ b/app/javascript/mastodon/components/button.js @@ -11,11 +11,11 @@ class Button extends React.PureComponent { secondary: PropTypes.bool, size: PropTypes.number, style: PropTypes.object, - children: PropTypes.node + children: PropTypes.node, }; static defaultProps = { - size: 36 + size: 36, }; handleClick = (e) => { @@ -29,7 +29,7 @@ class Button extends React.PureComponent { padding: `0 ${this.props.size / 2.25}px`, height: `${this.props.size}px`, lineHeight: `${this.props.size}px`, - ...this.props.style + ...this.props.style, }; return ( |