Merge branch 'permalink-id' of github.com:coralproject/talk into permalink-id

This commit is contained in:
Belen Curcio
2017-06-29 13:27:08 -03:00
4 changed files with 5 additions and 4 deletions
+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}
+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) =>
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "2.1.0",
"version": "2.2.0",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js",
"scripts": {
+2 -1
View File
@@ -12,6 +12,7 @@
"coral-plugin-auth",
"coral-plugin-offtopic",
"coral-plugin-viewing-options",
"coral-plugin-comment-content"
"coral-plugin-comment-content",
"talk-plugin-permalink"
]
}