diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-05-18 17:57:19 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-18 08:57:19 -0400 |
| commit | fc58174747cd25eded07c30f5f122d4f8122e7e5 (patch) | |
| tree | adf214b31013afacb3a6dba145389466d1519fee /webapp/utils | |
| parent | 2df5f65f55456a29f6fe75ea533051b99e271756 (diff) | |
| download | chat-fc58174747cd25eded07c30f5f122d4f8122e7e5.tar.gz chat-fc58174747cd25eded07c30f5f122d4f8122e7e5.tar.bz2 chat-fc58174747cd25eded07c30f5f122d4f8122e7e5.zip | |
PLT-6614 - Mentions badge styling and dropdown icon style (#6426)
* Mentions badge styling and dropdown icon style
* PLT-6134 - Fixing emoji picker border in RHS
Diffstat (limited to 'webapp/utils')
| -rw-r--r-- | webapp/utils/utils.jsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 3404a0b82..b860585cb 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -534,7 +534,7 @@ export function applyTheme(theme) { if (theme.sidebarHeaderTextColor) { changeCss('.multi-teams .team-sidebar .team-wrapper .team-container .team-btn, .sidebar--left .team__header .header__info, .app__body .sidebar--menu .team__header .header__info, .app__body .post-list__timestamp > div', 'color:' + theme.sidebarHeaderTextColor); - changeCss('.app__body .sidebar-header-dropdown__icon', 'fill:' + theme.sidebarHeaderTextColor); + changeCss('.app__body .sidebar-header-dropdown__icon svg', 'fill:' + theme.sidebarHeaderTextColor); changeCss('.sidebar--left .team__header .user__name, .app__body .sidebar--menu .team__header .user__name', 'color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.8)); changeCss('.sidebar--left .team__header:hover .user__name, .app__body .sidebar--menu .team__header:hover .user__name', 'color:' + theme.sidebarHeaderTextColor); changeCss('.app__body .modal .modal-header .modal-title, .app__body .modal .modal-header .modal-title .name, .app__body .modal .modal-header button.close', 'color:' + theme.sidebarHeaderTextColor); @@ -558,14 +558,14 @@ export function applyTheme(theme) { if (theme.mentionBj) { changeCss('.sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'background:' + theme.mentionBj); - changeCss('.app__body .sidebar--left .badge', 'background:' + theme.mentionBj); - changeCss('.multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'background:' + theme.mentionBj + ' !important'); + changeCss('.app__body .sidebar--left .mention-badge', 'background:' + theme.mentionBj); + changeCss('.multi-teams .team-sidebar .mention-badge', 'background:' + theme.mentionBj); } if (theme.mentionColor) { changeCss('.app__body .sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'color:' + theme.mentionColor); - changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor); - changeCss('.app__body .multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'color:' + theme.mentionColor + ' !important'); + changeCss('.app__body .sidebar--left .mention-badge', 'color:' + theme.mentionColor); + changeCss('.app__body .multi-teams .team-sidebar .mention-badge', 'color:' + theme.mentionColor); } if (theme.centerChannelBg) { @@ -671,7 +671,7 @@ export function applyTheme(theme) { changeCss('.app__body .emoji-picker', 'color:' + theme.centerChannelColor); changeCss('.app__body .emoji-picker-react', 'color:' + theme.centerChannelColor); changeCss('.app__body .emoji-picker-bottom', 'color:' + theme.centerChannelColor); - changeCss('.app__body .emoji-picker, .app__body .emoji-picker-react, .app__body .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); + changeCss('.app__body .emoji-picker, .app__body .emoji-picker-react-rhs-comment, .app__body .emoji-picker-react, .app__body .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); changeCss('.app__body .emoji-picker-bottom, .app__body .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); changeCss('.app__body .emoji-picker, .app__body .emoji-picker__items .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); changeCss('.app__body .emoji-picker-bottom, .app__body .emoji-picker__items .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); |