diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-06 10:23:04 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-06 10:23:04 -0400 |
| commit | 48df0037a244302bdb18efbd20015d936c4462e4 (patch) | |
| tree | 06eec827ccf7bd6e1df0828085eac159cb83bb4d /web/react/components/post_list.jsx | |
| parent | cc78cc9baced6693d7052a7ff9e9a0e04fbdff5f (diff) | |
| parent | 331ab2acfc16d5dcfe8ea1be94e5015506b9186b (diff) | |
| download | chat-48df0037a244302bdb18efbd20015d936c4462e4.tar.gz chat-48df0037a244302bdb18efbd20015d936c4462e4.tar.bz2 chat-48df0037a244302bdb18efbd20015d936c4462e4.zip | |
Merge pull request #329 from asaadmahmoodspin/ui-changes
UI Improvements
Diffstat (limited to 'web/react/components/post_list.jsx')
| -rw-r--r-- | web/react/components/post_list.jsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 3f59d5843..90a02e791 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -37,15 +37,23 @@ module.exports = React.createClass({ componentDidMount: function() { var user = UserStore.getCurrentUser(); if (user.props && user.props.theme) { - utils.changeCss('a.theme', 'color:'+user.props.theme+'; fill:'+user.props.theme+'!important;'); utils.changeCss('div.theme', 'background-color:'+user.props.theme+';'); utils.changeCss('.btn.btn-primary', 'background: ' + user.props.theme+';'); - utils.changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background: ' + utils.changeColor(user.props.theme, -10) +';'); utils.changeCss('.modal .modal-header', 'background: ' + user.props.theme+';'); utils.changeCss('.mention', 'background: ' + user.props.theme+';'); utils.changeCss('.mention-link', 'color: ' + user.props.theme+';'); utils.changeCss('@media(max-width: 768px){.search-bar__container', 'background: ' + user.props.theme+';}'); } + if (user.props.theme != '#000000' && user.props.theme != '#585858') { + utils.changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background: ' + utils.changeColor(user.props.theme, -10) +';'); + utils.changeCss('a.theme', 'color:'+user.props.theme+'; fill:'+user.props.theme+'!important;'); + } else if (user.props.theme == '#000000') { + utils.changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background: ' + utils.changeColor(user.props.theme, +50) +';'); + $('.team__header').addClass('theme--black'); + } else if (user.props.theme == '#585858') { + utils.changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background: ' + utils.changeColor(user.props.theme, +10) +';'); + $('.team__header').addClass('theme--gray'); + } PostStore.addChangeListener(this._onChange); ChannelStore.addChangeListener(this._onChange); |