Merge branch 'master' into fix-bugs-action-summaries

This commit is contained in:
Wyatt Johnson
2017-08-08 15:40:21 +10:00
committed by GitHub
3 changed files with 7 additions and 7 deletions
@@ -1,10 +1,10 @@
import React from 'react';
import ClickOutside from 'coral-framework/components/ClickOutside';
import styles from './Toggleable.css';
import classnames from 'classnames';
import cn from 'classnames';
const upArrow = <span className={classnames(styles.chevron, styles.up)}></span>;
const downArrow = <span className={classnames(styles.chevron, styles.down)}></span>;
const upArrow = <span className={cn(styles.chevron, styles.up)}></span>;
const downArrow = <span className={cn(styles.chevron, styles.down)}></span>;
export default class Toggleable extends React.Component {
constructor(props) {
@@ -23,11 +23,11 @@ export default class Toggleable extends React.Component {
}
render() {
const {children} = this.props;
const {children, className, ...rest} = this.props;
const {isOpen} = this.state;
return (
<ClickOutside onClickOutside={this.close}>
<span className={styles.Toggleable}>
<span {...rest} className={cn(className, styles.Toggleable)} >
<button className={styles.toggler} onClick={this.toggle}>{isOpen ? upArrow : downArrow}</button>
{isOpen ? children : null}
</span>
@@ -45,7 +45,7 @@ export class TopRightMenu extends React.Component {
}
};
return (
<Toggleable key={this.state.timesReset}>
<Toggleable key={this.state.timesReset} className="talk-stream-comment-chevron">
<div style={{position: 'absolute', right: 0, zIndex: 1}}>
<IgnoreUserWizard
user={comment.user}
@@ -6,7 +6,7 @@ import {showSignInDialog} from 'coral-framework/actions/auth';
import t from 'coral-framework/services/i18n';
const SignInButton = ({loggedIn, showSignInDialog}) => (
<div>
<div className="talk-stream-auth-sign-in-button">
{!loggedIn
? <Button id="coralSignInButton" onClick={showSignInDialog} full>
{t('sign_in.sign_in_to_comment')}