summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-10-05 13:16:39 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-10-13 09:42:25 -0400
commitae0eb91180130e27767d797bc47376b88f62f88b (patch)
tree41cb4ca57104c21303de56dcd48bb40e31f5ae36 /web
parenta11421c74b338eee6eedb4f4260a75f38aa3fd4c (diff)
downloadchat-ae0eb91180130e27767d797bc47376b88f62f88b.tar.gz
chat-ae0eb91180130e27767d797bc47376b88f62f88b.tar.bz2
chat-ae0eb91180130e27767d797bc47376b88f62f88b.zip
Hid the close button when the unread badge is visible and moved it to the right side of the sidebar
Diffstat (limited to 'web')
-rw-r--r--web/react/components/sidebar.jsx4
1 files changed, 2 insertions, 2 deletions
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'
>
{'×'}