From db29413000f695b09bfbc4846b6558eaf72cf0bf Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com>
Date: Wed, 25 May 2016 17:39:14 +0500
Subject: [PATCH] Minor UI improvements (#3095)

Updating config.json

Updating config.json

Updating config.json

Updating config.json
---
 .../admin_console/admin_navbar_dropdown.jsx   |  2 +-
 webapp/components/sidebar_right_menu.jsx      |  2 +-
 webapp/i18n/en.json                           |  4 ++--
 webapp/sass/layout/_headers.scss              |  6 ++---
 webapp/sass/responsive/_mobile.scss           |  2 +-
 webapp/sass/routes/_admin-console.scss        | 22 ++++++++++++++++++-
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index a923efc70e..dc0a987d3b 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -111,7 +111,7 @@ export default class AdminNavbarDropdown extends React.Component {
                                 <i className='fa fa-exchange'/>
                                 <FormattedMessage
                                     id='admin.nav.switch'
-                                    defaultMessage='Switch Teams'
+                                    defaultMessage='Team Selection'
                                 />
                             </Link>
                         </li>
diff --git a/webapp/components/sidebar_right_menu.jsx b/webapp/components/sidebar_right_menu.jsx
index 218a3b164a..09e8dff464 100644
--- a/webapp/components/sidebar_right_menu.jsx
+++ b/webapp/components/sidebar_right_menu.jsx
@@ -250,7 +250,7 @@ export default class SidebarRightMenu extends React.Component {
                                 <i className='fa fa-exchange'></i>
                                 <FormattedMessage
                                     id='sidebar_right_menu.switch_team'
-                                    defaultMessage='Switch Team'
+                                    defaultMessage='Team Selection'
                                 />
                             </Link>
                         </li>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 17554f9a68..d1abf7cc33 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -348,7 +348,7 @@
   "admin.nav.help": "Help",
   "admin.nav.logout": "Logout",
   "admin.nav.report": "Report a Problem",
-  "admin.nav.switch": "Switch Teams",
+  "admin.nav.switch": "Team Selection",
   "admin.privacy.false": "false",
   "admin.privacy.save": "Save",
   "admin.privacy.saving": "Saving Config...",
@@ -1168,7 +1168,7 @@
   "sidebar_right_menu.logout": "Logout",
   "sidebar_right_menu.manageMembers": "Manage Members",
   "sidebar_right_menu.report": "Report a Problem",
-  "sidebar_right_menu.switch_team": "Switch Team",
+  "sidebar_right_menu.switch_team": "Team Selection",
   "sidebar_right_menu.teamLink": "Get Team Invite Link",
   "sidebar_right_menu.teamSettings": "Team Settings",
   "signup_team.choose": "Teams you are a member of: ",
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 731e2abad5..7db5614388 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -67,9 +67,9 @@
 
 .channel-intro {
     border-bottom: 1px solid $light-gray;
-    padding: 0 0 5px;
-    max-width: 1000px;
-    margin: auto;
+    margin: 0 auto 15px;
+    max-width: 990px;
+    padding: 0 15px;
 
     .intro-links {
         display: inline-block;
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index cde58b45a8..049e12055b 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -47,7 +47,7 @@
     }
 
     .channel-intro {
-        margin: 0 15px 35px;
+        margin: 0 0 35px;
     }
 
     .post {
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index 0164f485e6..815ac9761d 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -240,7 +240,6 @@
 
 .admin-sidebar {
     background: #333;
-    border-right: 1px solid #ddd;
     height: 100%;
     left: 0;
     position: absolute;
@@ -315,6 +314,27 @@
         &--active {
             color: $white;
             font-weight: 600;
+
+            &:after {
+                -moz-osx-font-smoothing: grayscale;
+                -webkit-font-smoothing: antialiased;
+                color: whitesmoke;
+                content: "\f0d9";
+                display: inline-block;
+                font: normal normal normal 26px/1 FontAwesome;
+                position: absolute;
+                right: -1px;
+                text-rendering: auto;
+                top: 3px;
+            }
+        }
+    }
+
+    .sidebar-subsection-title {
+        &--active {
+            &:after {
+                top: 2px;
+            }
         }
     }