diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-13 12:29:15 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-13 12:29:15 -0500 |
| commit | cb8296a70f390b6e23c2c73f04160933d92b702d (patch) | |
| tree | d07d20db91fafe122a61a7ef07505873ac497e6f /web | |
| parent | 10901b4d50db171fa83e0c289d0eb34f4422f156 (diff) | |
| parent | e16faf45de24898b250227833d20d154e4d9c0c8 (diff) | |
| download | chat-cb8296a70f390b6e23c2c73f04160933d92b702d.tar.gz chat-cb8296a70f390b6e23c2c73f04160933d92b702d.tar.bz2 chat-cb8296a70f390b6e23c2c73f04160933d92b702d.zip | |
Merge pull request #1420 from asaadmahmoodspin/release-1.2
UI changes for Direct messages and Bad connection
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/more_direct_channels.jsx | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_post.scss | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx index 40deb37f2..d1265f67e 100644 --- a/web/react/components/more_direct_channels.jsx +++ b/web/react/components/more_direct_channels.jsx @@ -50,6 +50,10 @@ export default class MoreDirectChannels extends React.Component { handleFilterChange() { const filter = ReactDOM.findDOMNode(this.refs.filter).value; + if ($(window).width() > 768) { + $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0); + } + if (filter !== this.state.filter) { this.setState({filter}); } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 36f6f445e..ae02ccb4c 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -16,7 +16,8 @@ } .bad-connection { - background-color: rgb(255, 255, 172) !important; + background: #ffffac !important; + color: #D04444 !important; } .textarea-div { |