diff options
| author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-05-09 17:14:43 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-09 08:14:43 -0400 |
| commit | 64b6d8cde5cff996d1c14eecb082e1fe4caced5d (patch) | |
| tree | 19c306548d9b6c11f89f3801bd6a50ebf71dce5d /webapp/components | |
| parent | b4d28fe205e9bfb8d2d67526855f105eec4dfe4e (diff) | |
| download | chat-64b6d8cde5cff996d1c14eecb082e1fe4caced5d.tar.gz chat-64b6d8cde5cff996d1c14eecb082e1fe4caced5d.tar.bz2 chat-64b6d8cde5cff996d1c14eecb082e1fe4caced5d.zip | |
DM and Modal changes (#2927)
* DM and Modal changes
* Fixing image previews
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/filtered_user_list.jsx | 29 | ||||
| -rw-r--r-- | webapp/components/sidebar.jsx | 10 | ||||
| -rw-r--r-- | webapp/components/view_image.jsx | 5 |
3 files changed, 18 insertions, 26 deletions
diff --git a/webapp/components/filtered_user_list.jsx b/webapp/components/filtered_user_list.jsx index 83747c03d..cffafd663 100644 --- a/webapp/components/filtered_user_list.jsx +++ b/webapp/components/filtered_user_list.jsx @@ -104,26 +104,9 @@ class FilteredUserList extends React.Component { let count; if (users.length === this.state.users.length) { - count = ( - <FormattedMessage - id='filtered_user_list.count' - defaultMessage='{count} {count, plural, =0 {0 members} one {member} other {members}}' - values={{ - count: users.length - }} - /> - ); + count = '(' + users.length + ')'; } else { - count = ( - <FormattedMessage - id='filtered_user_list.countTotal' - defaultMessage='{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total' - values={{ - count: users.length, - total: this.state.users.length - }} - /> - ); + count = '(' + this.state.users.length + ')'; } let teamToggle; @@ -133,9 +116,10 @@ class FilteredUserList extends React.Component { teamMembers = []; teamToggle = ( - <div className='col-sm-6'> + <div className='member-select__container'> + <span className='member-count'>{count}</span> <select - className='form-control member-select' + className='form-control' id='restrictList' ref='restrictList' defaultValue='team' @@ -171,9 +155,8 @@ class FilteredUserList extends React.Component { /> </div> <div className='col-sm-6'> - <span className='member-count'>{count}</span> + {teamToggle} </div> - {teamToggle} </div> <div ref='userList' diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 29ad60acc..3bfe47393 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -509,7 +509,15 @@ export default class Sidebar extends React.Component { let directDivider; if (directMessageNonTeamItems.length !== 0) { - directDivider = <hr/>; + directDivider = + (<div className='sidebar__divider'> + <div className='sidebar__divider__text'> + <FormattedMessage + id='sidebar.otherMembers' + defaultMessage='Other teams' + /> + </div> + </div>); } // update the favicon to show if there are any notifications diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx index ccde54c78..c4d7cb4aa 100644 --- a/webapp/components/view_image.jsx +++ b/webapp/components/view_image.jsx @@ -319,7 +319,6 @@ class ViewImageModal extends React.Component { onClick={this.props.onModalDismissed} > <div - className='modal-back' onMouseEnter={this.onMouseEnterImage} onMouseLeave={this.onMouseLeaveImage} onClick={(e) => e.stopPropagation()} @@ -328,7 +327,9 @@ class ViewImageModal extends React.Component { className={closeButtonClass} onClick={this.props.onModalDismissed} /> - {content} + <div className='modal-image__content'> + {content} + </div> <ViewImagePopoverBar show={this.state.showFooter} fileId={this.state.imgId} |