Merge branch 'master' into use-talk-linting-preset

Conflicts:
	package.json
This commit is contained in:
Chi Vinh Le committed 2017-09-29 23:55:33 +07:00
commit d396f43fe3
47 files changed
+536 -398

No files matched your search

@@ -35,7 +35,7 @@ class LikeButton extends React.Component {
return (
<div className={cn(styles.container, `${plugin}-container`)}>
<button
className={cn(styles.button, {[styles.liked]: alreadyReacted}, `${plugin}-button`)}
className={cn(styles.button, {[`${styles.liked} talk-plugin-like-liked`]: alreadyReacted}, `${plugin}-button`)}
onClick={this.handleClick}
>
<span className={cn(`${plugin}-label`, styles.label)}>