diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
| commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
| tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /web/react/utils/constants.jsx | |
| parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
| parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
| download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/utils/constants.jsx')
| -rw-r--r-- | web/react/utils/constants.jsx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 1d856e067..7d2626fc1 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -33,7 +33,6 @@ module.exports = { RECIEVED_MSG: null, - CLICK_TEAM: null, RECIEVED_TEAM: null, RECIEVED_CONFIG: null, @@ -140,7 +139,7 @@ module.exports = { sidebarText: '#333333', sidebarUnreadText: '#333333', sidebarTextHoverBg: '#e6f2fa', - sidebarTextActiveBg: '#e1e1e1', + sidebarTextActiveBorder: '#378FD2', sidebarTextActiveColor: '#111111', sidebarHeaderBg: '#2389d7', sidebarHeaderTextColor: '#ffffff', @@ -162,7 +161,7 @@ module.exports = { sidebarText: '#fff', sidebarUnreadText: '#fff', sidebarTextHoverBg: '#136197', - sidebarTextActiveBg: '#136197', + sidebarTextActiveBorder: '#7AB0D6', sidebarTextActiveColor: '#FFFFFF', sidebarHeaderBg: '#2f81b7', sidebarHeaderTextColor: '#FFFFFF', @@ -184,7 +183,7 @@ module.exports = { sidebarText: '#fff', sidebarUnreadText: '#fff', sidebarTextHoverBg: '#4A5664', - sidebarTextActiveBg: '#39769C', + sidebarTextActiveBorder: '#39769C', sidebarTextActiveColor: '#FFFFFF', sidebarHeaderBg: '#1B2C3E', sidebarHeaderTextColor: '#FFFFFF', @@ -206,7 +205,7 @@ module.exports = { sidebarText: '#fff', sidebarUnreadText: '#fff', sidebarTextHoverBg: '#302e30', - sidebarTextActiveBg: '#484748', + sidebarTextActiveBorder: '#196CAF', sidebarTextActiveColor: '#FFFFFF', sidebarHeaderBg: '#1f1f1f', sidebarHeaderTextColor: '#FFFFFF', @@ -249,8 +248,8 @@ module.exports = { uiName: 'Sidebar Text Hover BG' }, { - id: 'sidebarTextActiveBg', - uiName: 'Sidebar Text Active BG' + id: 'sidebarTextActiveBorder', + uiName: 'Sidebar Text Active Border' }, { id: 'sidebarTextActiveColor', |