From fe84def81748495a897c5772a09d1fb4bf0790f2 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Tue, 15 Dec 2015 21:12:19 +0500
Subject: Multiple UI Improvements

---
 web/react/components/sidebar.jsx                            | 8 ++++++++
 web/react/components/user_settings/custom_theme_chooser.jsx | 2 +-
 web/react/utils/utils.jsx                                   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'web/react')

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 8393440cb..a1b93188a 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -378,6 +378,13 @@ export default class Sidebar extends React.Component {
             );
         }
 
+        var icon = null;
+        if (channel.type === 'O') {
+            icon = <div className='status'><i className='fa fa-globe'></i></div>;
+        } else if (channel.type === 'P') {
+            icon = <div className='status'><i className='fa fa-lock'></i></div>;
+        }
+
         // set up click handler to switch channels (or create a new channel for non-existant ones)
         var handleClick = null;
         var href = '#';
@@ -461,6 +468,7 @@ export default class Sidebar extends React.Component {
                     href={href}
                     onClick={handleClick}
                 >
+                    {icon}
                     {status}
                     {channel.display_name}
                     {badge}
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 55242ca7f..b7d90922a 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -92,7 +92,7 @@ export default class CustomThemeChooser extends React.Component {
                     >
                         <img
                             width='200'
-                            src={'/static/images/themes/code_themes/' + theme[element.id] + 'Large.png'}
+                            src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'}
                         />
                     </Popover>
                 );
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index fb8b89252..a98d22eaf 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -544,7 +544,7 @@ export function applyTheme(theme) {
         changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'color:' + theme.sidebarText, 1);
         changeCss('.sidebar--left .nav-pills__container li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6), 1);
         changeCss('.sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText, 1);
-        changeCss('.sidebar--left .status path', 'fill:' + changeOpacity(theme.sidebarText, 0.5), 1);
+        changeCss('.sidebar--left .status path', 'fill:' + theme.sidebarText, 1);
         changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 2);
     }
 
-- 
cgit v1.2.3-1-g7c22