wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-09 12:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into css-override-classes

Browse Source
This commit is contained in:
riley
2017-06-05 16:19:46 -06:00
parent 8ea7ba9b69 fb537c9990
commit d03647067d
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed-stream/src/components/Embed.js
+4 -4
View File
@@ -41,10 +41,10 @@ export default class Embed extends React.Component {
return (
<div>
<div className="commentStream">
<TabBar onChange={this.changeTab} activeTab={activeTab}>
<Tab><Count count={totalCommentCount} /></Tab>
<Tab>{t('framework.my_profile')}</Tab>
<Tab restricted={!can(user, 'UPDATE_CONFIG')}>{t('framework.configure_stream')}</Tab>
<TabBar onChange={this.changeTab} activeTab={activeTab} className='talk-stream-tabbar'>
<Tab className={'talk-stream-comment-count-tab'}><Count count={totalCommentCount}/></Tab>
<Tab className={'talk-stream-profile-tab'}>{t('framework.my_profile')}</Tab>
<Tab className={'talk-stream-configuration-tab'} restricted={!can(user, 'UPDATE_CONFIG')}>{t('framework.configure_stream')}</Tab>
</TabBar>
{commentId &&
<Button
client/coral-ui/components/Tab.js
+2 -3
View File
@@ -1,13 +1,12 @@
import React from 'react';
import styles from './Tab.css';
export default ({children, tabId, active, onTabClick, cStyle = 'base'}) => (
export default ({children, tabId, active, onTabClick, cStyle = 'base', ...props}) => (
<li
key={tabId}
className={active ? styles[`${cStyle}--active`] : ''}
className={`${active ? styles[`${cStyle}--active`] : ''} tab ${props.className}`}
onClick={() => onTabClick(tabId)}
>
{children}
</li>
);
client/coral-ui/components/TabBar.js
+1 -1
View File
@@ -17,7 +17,7 @@ class TabBar extends React.Component {
const {children, activeTab, cStyle = 'base'} = this.props;
return (
<div>
<ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''}`}>
<ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''} ${this.props.className}`}>
{React.Children.toArray(children)
.filter((child) => !child.props.restricted)
.map((child, tabId) =>