Revert "Ui fixes" (#4963)

6 files changed, 22 insertions, 26 deletions

diff --git a/webapp/components/channel_members_modal.jsx b/webapp/components/channel_members_modal.jsx
index 70547d409..9f6a2a2eb 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 more-modal--action'
+                    dialogClassName='more-modal'
                     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 5374c3344..783aeff50 100644
--- a/webapp/components/more_channels.jsx
+++ b/webapp/components/more_channels.jsx
@@ -159,7 +159,7 @@ export default class MoreChannels extends React.Component {
 
         return (
             <Modal
-                dialogClassName='more-modal more-modal--action'
+                dialogClassName='more-modal more-public-channels'
                 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 a3318d0c8..1b287b3b2 100644
--- a/webapp/components/more_direct_channels.jsx
+++ b/webapp/components/more_direct_channels.jsx
@@ -195,9 +195,7 @@ 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
@@ -228,7 +226,7 @@ export default class MoreDirectChannels extends React.Component {
 
         return (
             <Modal
-                dialogClassName={'more-modal more-direct-channels ' + memberClass}
+                dialogClassName='more-modal more-direct-channels'
                 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 d7d9929ee..7cb2f7261 100644
--- a/webapp/components/profile_popover.jsx
+++ b/webapp/components/profile_popover.jsx
@@ -185,34 +185,34 @@ export default class ProfilePopover extends React.Component {
         const fullname = Utils.getFullName(this.props.user);
         if (fullname) {
             dataContent.push(
-                <OverlayTrigger
-                    delayShow={Constants.WEBRTC_TIME_DELAY}
-                    placement='top'
-                    overlay={<Tooltip id='fullNameTooltip'>{fullname}</Tooltip>}
+                <div
+                    data-toggle='tooltip'
+                    title={fullname}
+                    key='user-popover-fullname'
                 >
-                    <div
-                        className='overflow--ellipsis text-nowrap padding-bottom'
+                    <p
+                        className='text-nowrap'
                     >
                         {fullname}
-                    </div>
-                </OverlayTrigger>
+                    </p>
+                </div>
             );
         }
 
         if (this.props.user.position) {
             const position = this.props.user.position.substring(0, Constants.MAX_POSITION_LENGTH);
             dataContent.push(
-                <OverlayTrigger
-                    delayShow={Constants.WEBRTC_TIME_DELAY}
-                    placement='top'
-                    overlay={<Tooltip id='positionTooltip'>{position}</Tooltip>}
+                <div
+                    data-toggle='tooltip'
+                    title={position}
+                    key='user-popover-position'
                 >
-                    <div
-                        className='overflow--ellipsis text-nowrap padding-bottom'
+                    <p
+                        className='text-nowrap'
                     >
                         {position}
-                    </div>
-                </OverlayTrigger>
+                    </p>
+                </div>
             );
         }
 
diff --git a/webapp/components/searchable_channel_list.jsx b/webapp/components/searchable_channel_list.jsx
index df1fb61f7..afd113975 100644
--- a/webapp/components/searchable_channel_list.jsx
+++ b/webapp/components/searchable_channel_list.jsx
@@ -180,9 +180,7 @@ export default class SearchableChannelList extends React.Component {
                     ref='channelList'
                     className='more-modal__list'
                 >
-                    <div>
-                        {listContent}
-                    </div>
+                    {listContent}
                 </div>
                 <div className='filter-controls'>
                     {previousButton}
diff --git a/webapp/components/setting_item_max.jsx b/webapp/components/setting_item_max.jsx
index 5971ce584..904e6c8d1 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 pull-right'
+                    className='btn btn-sm btn-primary'
                     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 pull-right'
+                                className='btn btn-sm theme'
                                 href='#'
                                 onClick={this.props.updateSection}
                             >