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

Merge branch 'master' into permalink-id

Browse Source
This commit is contained in:
Belén Curcio
2017-06-29 12:35:06 -03:00
committed by GitHub
parent a7f4dea74a a0a7971866
commit fbefd7fd20
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-ui/components/Tab.js
+1 -1
View File
@@ -4,7 +4,7 @@ import styles from './Tab.css';
export default ({children, tabId, active, onTabClick, cStyle = 'base', ...props}) => (
<li
key={tabId}
className={`${active ? `${styles[`${cStyle}--active`]} coral-tab-active` : ''} coral-tab ${props.className}`}
className={`${active ? `${styles[`${cStyle}--active`]} talk-tab-active` : ''} talk-tab ${props.className}`}
onClick={() => onTabClick(tabId)}
>
{children}
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] : ''} ${this.props.className}`}>
<ul className={`${styles.base} ${cStyle ? styles[cStyle] : ''} talk-tab-bar ${this.props.className}`}>
{React.Children.toArray(children)
.filter((child) => !child.props.restricted)
.map((child, tabId) =>