summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-01 08:49:54 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-01 08:49:54 -0400
commit72575ac7bdd5bfe7bd544ba238f8d1c0126635aa (patch)
treef1ed51dfc87879e73261625f3afb4d4169e2a3f8 /web/react/components/sidebar.jsx
parent0b3db018d33601a44c86d08771441c5dacd18969 (diff)
parent8d6c35481124d7e30bdb559f440c48b3e5eb4e0d (diff)
downloadchat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.tar.gz
chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.tar.bz2
chat-72575ac7bdd5bfe7bd544ba238f8d1c0126635aa.zip
Merging release branch 'release-0.7.0'
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r--web/react/components/sidebar.jsx1
1 files changed, 0 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 8dd192893..5b74165f3 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -278,7 +278,6 @@ module.exports = React.createClass({
var lastUnreadElement = $(this.refs[this.lastUnreadChannel].getDOMNode());
if (lastUnreadElement.position().top > container.height()) {
- $(this.refs.bottomUnreadIndicator.getDOMNode()).css('bottom', '0');
$(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'initial');
} else {
$(this.refs.bottomUnreadIndicator.getDOMNode()).css('display', 'none');