From b1a7225f30e8443f87830a578c306b8f93e6587f Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 25 Sep 2015 16:38:11 +0500 Subject: Bug fixes and UI improvements for multiple tickets --- web/react/components/channel_loader.jsx | 2 ++ web/react/components/post_info.jsx | 2 ++ web/react/components/user_profile.jsx | 1 - web/react/utils/utils.jsx | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'web/react') diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 39c86405c..ac4f57ce2 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -84,6 +84,8 @@ export default class ChannelLoader extends React.Component { }); }); + $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'}); + $('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) { if (ev.type === 'mouseenter') { $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after'); diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index c38edf6a2..8ad2336fb 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -153,7 +153,9 @@ export default class PostInfo extends React.Component {
  • diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index c5d028d31..61bf647ca 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -32,7 +32,6 @@ export default class UserProfile extends React.Component { componentDidMount() { UserStore.addChangeListener(this.onChange); $('#profile_' + this.uniqueId).popover({placement: 'right', container: 'body', trigger: 'hover', html: true, delay: {show: 200, hide: 100}}); - $('body').tooltip({selector: '[data-toggle=tooltip]', trigger: 'hover click'}); } componentWillUnmount() { UserStore.removeChangeListener(this.onChange); diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 50438c6cf..fba57e8e6 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -616,8 +616,9 @@ export function applyTheme(theme) { } if (theme.centerChannelColor) { - changeCss('.app__content', 'color:' + theme.centerChannelColor, 2); + changeCss('.app__content, .post-create__container .post-create-body .btn-file', 'color:' + theme.centerChannelColor, 1); changeCss('#post-create', 'color:' + theme.centerChannelColor, 2); + changeCss('.post-body hr', 'background:' + theme.centerChannelColor, 1); changeCss('.channel-header .heading', 'color:' + theme.centerChannelColor, 1); changeCss('.markdown__table tbody tr:nth-child(2n)', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1); changeCss('.channel-header__info>div.dropdown .header-dropdown__icon', 'color:' + changeOpacity(theme.centerChannelColor, 0.8), 1); -- cgit v1.2.3-1-g7c22