From fb05a16b0c989b1d6e3fd3bda6381036ace2753f Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 23 Oct 2015 20:34:21 +0500
Subject: Updating nav active bg and Send invitation button

---
 web/react/components/invite_member_modal.jsx | 8 +++++++-
 web/react/utils/utils.jsx                    | 1 +
 web/sass-files/sass/partials/_settings.scss  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index 4986f88b6..86a4b04cf 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -260,6 +260,12 @@ export default class InviteMemberModal extends React.Component {
 
             var content = null;
             var sendButton = null;
+
+            var sendButtonLabel = 'Send Invitation';
+            if (this.state.inviteIds.length > 1) {
+                sendButtonLabel = 'Send Invitations';
+            }
+
             if (this.state.emailEnabled) {
                 content = (
                     <div>
@@ -281,7 +287,7 @@ export default class InviteMemberModal extends React.Component {
                             onClick={this.handleSubmit}
                             type='button'
                             className='btn btn-primary'
-                        >Send Invitations</button>
+                        >{sendButtonLabel}</button>
                     );
             } else {
                 var teamInviteLink = null;
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index e1a295444..67a9d6983 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -431,6 +431,7 @@ export function applyTheme(theme) {
 
     if (theme.sidebarTextActiveColor) {
         changeCss('.sidebar--left .nav-pills__container li.active a, .sidebar--left .nav-pills__container li.active a:hover, .sidebar--left .nav-pills__container li.active a:focus, .settings-modal .nav-pills>li.active a, .settings-modal .nav-pills>li.active a:hover, .settings-modal .nav-pills>li.active a:active', 'color:' + theme.sidebarTextActiveColor, 2);
+        changeCss('.sidebar--left .nav li.active a, .sidebar--left .nav li.active a:hover, .sidebar--left .nav li.active a:focus', 'background:' + changeOpacity(theme.sidebarTextActiveColor, 0.1), 1);
     }
 
     if (theme.sidebarHeaderBg) {
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 83f6cddde..c881f9073 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -43,7 +43,7 @@
         }
         .nav {
             position: fixed;
-            top: 55px;
+            top: 57px;
             width: 180px;
         }
         .security-links {
-- 
cgit v1.2.3-1-g7c22