From ae0eb91180130e27767d797bc47376b88f62f88b Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 5 Oct 2015 13:16:39 -0400
Subject: Hid the close button when the unread badge is visible and moved it to
 the right side of the sidebar

---
 web/react/components/sidebar.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/sidebar.jsx')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 97f705f32..2619798eb 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -452,10 +452,10 @@ export default class Sidebar extends React.Component {
         }
 
         let closeButton = null;
-        if (handleClose) {
+        if (handleClose && !badge) {
             closeButton = (
                 <span
-                    className='sidebar-channel__close'
+                    className='sidebar-channel__close pull-right'
                     data-close='true'
                 >
                     {'×'}
-- 
cgit v1.2.3-1-g7c22