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

Merge branch 'master' into community-pagination-

Browse Source
This commit is contained in:
Kiwi
2017-10-25 17:09:34 +02:00
committed by GitHub
parent 3ff47dc610 9bfc17d332
commit e782df815b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/routes/Moderation/components/ViewOptions.css
+1 -1
View File
@@ -53,7 +53,7 @@
list-style: none;
}
.dropdow {
.dropdownContainer {
position: relative;
margin-top: 5px;
client/coral-admin/src/routes/Moderation/components/ViewOptions.js
+1
View File
@@ -23,6 +23,7 @@ class ViewOptions extends React.Component {
<li className={styles.viewOptionsItem}>
Sort Comments
<Dropdown
containerClassName={styles.dropdownContainer}
toggleClassName={styles.dropdownToggle}
toggleOpenClassName={styles.dropdownToggleOpen}
placeholder={t('modqueue.sort')}
client/coral-ui/components/Dropdown.js
+3 -3
View File
@@ -128,10 +128,10 @@ class Dropdown extends React.Component {
}
render() {
const {className, toggleClassName, toggleOpenClassName} = this.props;
const {containerClassName, toggleClassName, toggleOpenClassName} = this.props;
return (
<ClickOutside onClickOutside={this.hideMenu}>
<div className={cn(styles.dropdown, className)}>
<div className={cn(styles.dropdown, containerClassName)}>
<div
className={cn(styles.toggle, toggleClassName, {[cn(this.state.isOpen, toggleOpenClassName)]: this.state.isOpen})}
onClick={this.handleClick}
@@ -170,7 +170,7 @@ class Dropdown extends React.Component {
}
Dropdown.propTypes = {
className: PropTypes.string,
containerClassName: PropTypes.string,
toggleClassName: PropTypes.string,
toggleOpenClassName: PropTypes.string,
placeholder: PropTypes.string,