diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/channel_members_modal.jsx | 2 | ||||
-rw-r--r-- | webapp/components/more_channels.jsx | 2 | ||||
-rw-r--r-- | webapp/components/more_direct_channels.jsx | 4 | ||||
-rw-r--r-- | webapp/components/profile_popover.jsx | 32 | ||||
-rw-r--r-- | webapp/components/searchable_channel_list.jsx | 4 | ||||
-rw-r--r-- | webapp/components/setting_item_max.jsx | 4 |
6 files changed, 26 insertions, 22 deletions
diff --git a/webapp/components/channel_members_modal.jsx b/webapp/components/channel_members_modal.jsx index 9f6a2a2eb..70547d409 100644 --- a/webapp/components/channel_members_modal.jsx +++ b/webapp/components/channel_members_modal.jsx @@ -168,7 +168,7 @@ export default class ChannelMembersModal extends React.Component { return ( <div> <Modal - dialogClassName='more-modal' + dialogClassName='more-modal more-modal--action' show={this.state.show} onHide={this.onHide} onExited={this.props.onModalDismissed} diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx index b9b841ad8..b0064f18a 100644 --- a/webapp/components/more_channels.jsx +++ b/webapp/components/more_channels.jsx @@ -163,7 +163,7 @@ export default class MoreChannels extends React.Component { return ( <Modal - dialogClassName='more-modal more-public-channels' + dialogClassName='more-modal more-modal--action' show={this.state.show} onHide={this.handleHide} onExited={this.handleExit} diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index 1b287b3b2..a3318d0c8 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -195,7 +195,9 @@ export default class MoreDirectChannels extends React.Component { render() { let teamToggle; + let memberClass = ''; if (global.window.mm_config.RestrictDirectMessage === 'any') { + memberClass = 'more-system-members'; teamToggle = ( <div className='member-select__container'> <select @@ -226,7 +228,7 @@ export default class MoreDirectChannels extends React.Component { return ( <Modal - dialogClassName='more-modal more-direct-channels' + dialogClassName={'more-modal more-direct-channels ' + memberClass} show={this.state.show} onHide={this.handleHide} onExited={this.handleExit} diff --git a/webapp/components/profile_popover.jsx b/webapp/components/profile_popover.jsx index a342f312f..8b431b643 100644 --- a/webapp/components/profile_popover.jsx +++ b/webapp/components/profile_popover.jsx @@ -152,34 +152,34 @@ export default class ProfilePopover extends React.Component { const fullname = Utils.getFullName(this.props.user); if (fullname) { dataContent.push( - <div - data-toggle='tooltip' - title={fullname} - key='user-popover-fullname' + <OverlayTrigger + delayShow={Constants.WEBRTC_TIME_DELAY} + placement='top' + overlay={<Tooltip id='fullNameTooltip'>{fullname}</Tooltip>} > - <p - className='text-nowrap' + <div + className='overflow--ellipsis text-nowrap padding-bottom' > {fullname} - </p> - </div> + </div> + </OverlayTrigger> ); } if (this.props.user.position) { const position = this.props.user.position.substring(0, Constants.MAX_POSITION_LENGTH); dataContent.push( - <div - data-toggle='tooltip' - title={position} - key='user-popover-position' + <OverlayTrigger + delayShow={Constants.WEBRTC_TIME_DELAY} + placement='top' + overlay={<Tooltip id='positionTooltip'>{position}</Tooltip>} > - <p - className='text-nowrap' + <div + className='overflow--ellipsis text-nowrap padding-bottom' > {position} - </p> - </div> + </div> + </OverlayTrigger> ); } diff --git a/webapp/components/searchable_channel_list.jsx b/webapp/components/searchable_channel_list.jsx index afd113975..df1fb61f7 100644 --- a/webapp/components/searchable_channel_list.jsx +++ b/webapp/components/searchable_channel_list.jsx @@ -180,7 +180,9 @@ export default class SearchableChannelList extends React.Component { ref='channelList' className='more-modal__list' > - {listContent} + <div> + {listContent} + </div> </div> <div className='filter-controls'> {previousButton} diff --git a/webapp/components/setting_item_max.jsx b/webapp/components/setting_item_max.jsx index 904e6c8d1..5971ce584 100644 --- a/webapp/components/setting_item_max.jsx +++ b/webapp/components/setting_item_max.jsx @@ -49,7 +49,7 @@ export default class SettingItemMax extends React.Component { submit = ( <input type='submit' - className='btn btn-sm btn-primary' + className='btn btn-sm btn-primary pull-right' href='#' onClick={this.props.submit} value={Utils.localizeMessage('setting_item_max.save', 'Save')} @@ -88,7 +88,7 @@ export default class SettingItemMax extends React.Component { {clientError} {submit} <a - className='btn btn-sm theme' + className='btn btn-sm pull-right' href='#' onClick={this.props.updateSection} > |