diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-06-07 02:24:23 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-06 17:24:23 -0400 |
| commit | 1eed253fc23bf164d18ea506cf3bc35ce0ce1fbb (patch) | |
| tree | 7a82d501c2894f4956cad4e53b42ce5dda1482e3 /webapp/utils | |
| parent | 6e7b912ec61a6a791e0e8405ff6f6bd7e622a187 (diff) | |
| download | chat-1eed253fc23bf164d18ea506cf3bc35ce0ce1fbb.tar.gz chat-1eed253fc23bf164d18ea506cf3bc35ce0ce1fbb.tar.bz2 chat-1eed253fc23bf164d18ea506cf3bc35ce0ce1fbb.zip | |
Channel switcher UI improvements (#6564)
* Channel switcher UI improvements
* Reverting mattermost theme
* Fixing spacing above the button
* Updating switcher button
* PLT-6691 - Fixing tablet header
Diffstat (limited to 'webapp/utils')
| -rw-r--r-- | webapp/utils/constants.jsx | 36 | ||||
| -rw-r--r-- | webapp/utils/utils.jsx | 8 |
2 files changed, 22 insertions, 22 deletions
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index ea87f2cd4..dc0856888 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -481,28 +481,28 @@ export const Constants = { }, mattermost: { type: 'Mattermost', - sidebarBg: '#1a1d1f', - sidebarText: '#ffffff', - sidebarUnreadText: '#e8e8e8', - sidebarTextHoverBg: '#525252', - sidebarTextActiveBorder: '#27a1b2', - sidebarTextActiveColor: '#ffffff', - sidebarHeaderBg: '#1a1d1f', + sidebarBg: '#fafafa', + sidebarText: '#333333', + sidebarUnreadText: '#333333', + sidebarTextHoverBg: '#e6f2fa', + sidebarTextActiveBorder: '#378FD2', + sidebarTextActiveColor: '#111111', + sidebarHeaderBg: '#3481B9', sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#1fc1d9', - awayIndicator: '#c4c492', - mentionBj: '#ba3939', + onlineIndicator: '#7DBE00', + awayIndicator: '#DCBD4E', + mentionBj: '#2389d7', mentionColor: '#ffffff', centerChannelBg: '#ffffff', - centerChannelColor: '#2d3138', - newMessageSeparator: '#1c8c99', - linkColor: '#1c8c99', - buttonBg: '#27a1b2', + centerChannelColor: '#333333', + newMessageSeparator: '#FF8800', + linkColor: '#2389d7', + buttonBg: '#23A2FF', buttonColor: '#FFFFFF', - errorTextColor: '#cc2d2d', - mentionHighlightBg: '#1c8c99', - mentionHighlightLink: '#ffffff', - codeTheme: 'monokai', + errorTextColor: '#a94442', + mentionHighlightBg: '#f3e197', + mentionHighlightLink: '#2f81b7', + codeTheme: 'github', image: mattermostThemeImage }, mattermostDark: { diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 09875fe02..de0976c14 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -499,10 +499,10 @@ export function applyTheme(theme) { if (theme.sidebarText) { changeCss('.app__body .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y', 'background:' + theme.sidebarText); changeCss('.app__body .ps-container:hover .ps-scrollbar-y-rail:hover', 'background:' + changeOpacity(theme.sidebarText, 0.15)); - changeCss('.sidebar--left .nav-pills__container li>a, .app__body .sidebar--right, .app__body .modal .settings-modal .nav-pills>li a', 'color:' + changeOpacity(theme.sidebarText, 0.6)); + changeCss('.sidebar--left .nav-pills__container li > a, .app__body .sidebar--right, .app__body .modal .settings-modal .nav-pills>li a', 'color:' + changeOpacity(theme.sidebarText, 0.6)); changeCss('@media(max-width: 768px){.app__body .modal .settings-modal .settings-table .nav>li>a, .app__body .sidebar--menu', 'color:' + changeOpacity(theme.sidebarText, 0.8)); - changeCss('.sidebar--left .nav-pills__container li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6)); - changeCss('.app__body .sidebar--left .sidebar__switcher, .sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText); + changeCss('.sidebar--left .nav-pills__container li > h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6)); + changeCss('.app__body .sidebar--left .sidebar__switcher button, .sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText); changeCss('.sidebar--left .status .offline--icon', 'fill:' + theme.sidebarText); changeCss('.sidebar--left .status.status--group', 'background:' + changeOpacity(theme.sidebarText, 0.3)); changeCss('@media(max-width: 768px){.app__body .modal .settings-modal .settings-table .nav>li>a, .app__body .sidebar--menu .divider', 'border-color:' + changeOpacity(theme.sidebarText, 0.2)); @@ -515,7 +515,7 @@ export function applyTheme(theme) { } if (theme.sidebarTextHoverBg) { - changeCss('.sidebar--left .nav-pills__container li>a:hover, .app__body .modal .settings-modal .nav-pills>li:hover a', 'background:' + theme.sidebarTextHoverBg); + changeCss('.sidebar--left .nav-pills__container li > a:hover, .app__body .modal .settings-modal .nav-pills>li:hover a, .app__body .sidebar__switcher button:hover', 'background:' + theme.sidebarTextHoverBg); } if (theme.sidebarTextActiveBorder) { |