Merge pull request #2114 from asaadmahmoodspin/ui-improvements

Multiple UI Improvements

6 files changed, 14 insertions, 12 deletions

diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index 02b01b090..0c1a55cc1 100644
--- a/web/react/components/admin_console/user_item.jsx
+++ b/web/react/components/admin_console/user_item.jsx
@@ -360,8 +360,8 @@ export default class UserItem extends React.Component {
                         height='36'
                         width='36'
                     />
-                    <span className='member-name'>{Utils.getDisplayName(user)}</span>
-                    <span className='member-email'>{email}</span>
+                    <span className='more-name'>{Utils.getDisplayName(user)}</span>
+                    <span className='more-description'>{email}</span>
                     <div className='dropdown member-drop'>
                         <a
                             href='#'
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index c50ee5c96..41ea58eeb 100644
--- a/web/react/components/member_list_item.jsx
+++ b/web/react/components/member_list_item.jsx
@@ -124,8 +124,8 @@ export default class MemberListItem extends React.Component {
                         height='36'
                         width='36'
                     />
-                    <div className='member-name'>{Utils.displayUsername(member.id)}</div>
-                    <div className='member-description'>{member.email}</div>
+                    <div className='more-name'>{Utils.displayUsername(member.id)}</div>
+                    <div className='more-description'>{member.email}</div>
                 </td>
                 <td className='td--action lg'>{invite}</td>
             </tr>
diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx
index 6e1006911..30086d1b2 100644
--- a/web/react/components/member_list_team_item.jsx
+++ b/web/react/components/member_list_team_item.jsx
@@ -208,8 +208,8 @@ export default class MemberListTeamItem extends React.Component {
                         height='36'
                         width='36'
                     />
-                    <span className='member-name'>{Utils.displayUsername(user.id)}</span>
-                    <span className='member-email'>{email}</span>
+                    <span className='more-name'>{Utils.displayUsername(user.id)}</span>
+                    <span className='more-description'>{email}</span>
                     <div className='dropdown member-drop'>
                         <a
                             href='#'
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index d12ea4703..d800f93d8 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -114,7 +114,7 @@ export default class MoreChannels extends React.Component {
                                     <tr key={channel.id}>
                                         <td>
                                             <p className='more-name'>{channel.display_name}</p>
-                                            <p className='more-purpose'>{channel.purpose}</p>
+                                            <p className='more-description'>{channel.purpose}</p>
                                         </td>
                                         <td className='td--action'>
                                             {joinButton}
diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx
index f108ace2e..ebe19abad 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -94,7 +94,7 @@ export default class PostsView extends React.Component {
             });
         }
 
-        this.scrollStopAction.fireAfter(1000);
+        this.scrollStopAction.fireAfter(2000);
     }
     handleScrollStop() {
         this.setState({
@@ -564,6 +564,8 @@ function ScrollToBottomArrows({isScrolling, atBottom, onClick}) {
         <div
             className={className}
             onClick={onClick}
-        />
+        >
+            <span dangerouslySetInnerHTML={{__html: Constants.SCROLL_BOTTOM_ICON}} />
+        </div>
     );
 }
diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index d23d2957e..3656424b2 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -271,7 +271,7 @@ export default class ManageCommandCmds extends React.Component {
             cmds.push(
                 <div
                     key={cmd.id}
-                    className='webcmd__item'
+                    className='webhook__item webcmd__item'
                 >
                     <div className='padding-top x2'>
                         <strong>
@@ -400,7 +400,7 @@ export default class ManageCommandCmds extends React.Component {
         }
 
         const existingCmds = (
-            <div className='webcmds__container'>
+            <div className='webhooks__container webcmds__container'>
                 <label className='control-label padding-top x2'>
                     <FormattedMessage
                         id='user.settings.cmds.existing'
@@ -408,7 +408,7 @@ export default class ManageCommandCmds extends React.Component {
                     />
                 </label>
                 <div className='padding-top divider-light'></div>
-                <div className='webcmds__list'>
+                <div className='webhooks__list webcmds__list'>
                     {displayCmds}
                 </div>
             </div>