From 52f73c30cafd6afaa11361b05972e25ebc223a81 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Mon, 22 May 2017 23:17:29 +0500
Subject: PLT-6651 - Overlay issue modal	 (#6473)

* PLT-6651 - Overlay issue modal

* Fixing mentions badge
---
 webapp/components/channel_switch_modal.jsx                | 2 +-
 webapp/components/notify_counts.jsx                       | 4 ++--
 webapp/components/sidebar.jsx                             | 2 +-
 webapp/components/team_sidebar/components/team_button.jsx | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'webapp/components')

diff --git a/webapp/components/channel_switch_modal.jsx b/webapp/components/channel_switch_modal.jsx
index 1ad9249e8..0f1fc4252 100644
--- a/webapp/components/channel_switch_modal.jsx
+++ b/webapp/components/channel_switch_modal.jsx
@@ -139,7 +139,7 @@ export default class SwitchChannelModal extends React.Component {
         const message = this.state.error;
         return (
             <Modal
-                dialogClassName='channel-switch-modal'
+                dialogClassName='channel-switch-modal modal--overflow'
                 ref='modal'
                 show={this.props.show}
                 onHide={this.onHide}
diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx
index 6fcb3acdf..f05ecbf12 100644
--- a/webapp/components/notify_counts.jsx
+++ b/webapp/components/notify_counts.jsx
@@ -37,9 +37,9 @@ export default class NotifyCounts extends React.Component {
     }
     render() {
         if (this.state.mentionCount) {
-            return <span className='mention-badge badge-notify'>{this.state.mentionCount}</span>;
+            return <span className='badge badge-notify'>{this.state.mentionCount}</span>;
         } else if (this.state.messageCount) {
-            return <span className='mention-badge badge-notify'>{'•'}</span>;
+            return <span className='badge badge-notify'>{'•'}</span>;
         }
         return null;
     }
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index a0e69c52a..f8b3616f3 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -517,7 +517,7 @@ export default class Sidebar extends React.Component {
         var badge = null;
         if (channelMember) {
             if (unreadCount.mentions) {
-                badge = <span className='mention-badge pull-right small'>{unreadCount.mentions}</span>;
+                badge = <span className='badge pull-right small'>{unreadCount.mentions}</span>;
                 this.badgesActive = true;
             }
         } else if (this.state.loadingDMChannel === index && channel.type === Constants.DM_CHANNEL) {
diff --git a/webapp/components/team_sidebar/components/team_button.jsx b/webapp/components/team_sidebar/components/team_button.jsx
index 5a9b9dd59..e0670d6da 100644
--- a/webapp/components/team_sidebar/components/team_button.jsx
+++ b/webapp/components/team_sidebar/components/team_button.jsx
@@ -42,7 +42,7 @@ export default class TeamButton extends React.Component {
 
             if (this.props.mentions) {
                 badge = (
-                    <span className='mention-badge pull-right small'>{this.props.mentions}</span>
+                    <span className='badge pull-right small'>{this.props.mentions}</span>
                 );
             }
         }
-- 
cgit v1.2.3-1-g7c22