Merge branch 'master' into pre-responsive-admin-cleanup

This commit is contained in:
Kim Gardner
2017-08-10 10:57:40 +01:00
committed by GitHub
30 changed files with 293 additions and 101 deletions
@@ -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')}
@@ -36,7 +36,7 @@ class TabPane extends React.Component {
{featuredComments.hasNextPage &&
<LoadMore
loadMore={this.loadMore}
loadingState={this.loadingState}
loadingState={this.state.loadingState}
/>
}
</div>