Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux

src/components/views/rooms/RoomTile.js

@@ -27,6 +27,7 @@ var ContextualMenu = require('../../structures/ContextualMenu');
 var RoomNotifs = require('../../../RoomNotifs');
 var FormattingUtils = require('../../../utils/FormattingUtils');
 var AccessibleButton = require('../elements/AccessibleButton');
+var UserSettingsStore = require('../../../UserSettingsStore');
 
 module.exports = React.createClass({
     displayName: 'RoomTile',
@@ -177,7 +178,8 @@ module.exports = React.createClass({
             var self = this;
             ContextualMenu.createMenu(RoomTagMenu, {
                 chevronOffset: 10,
-                menuColour: "#FFFFFF",
+                // XXX: fix horrid hardcoding
+                menuColour: UserSettingsStore.getSyncedSettings().theme === 'dark' ? "#2d2d2d" : "#FFFFFF",
                 left: x,
                 top: y,
                 room: this.props.room,
@@ -220,7 +222,7 @@ module.exports = React.createClass({
         var avatarContainerClasses = classNames({
             'mx_RoomTile_avatar_container': true,
             'mx_RoomTile_avatar_roomTagMenu': this.state.roomTagMenu,
-        })
+        });
 
         var badgeClasses = classNames({
             'mx_RoomTile_badge': true,
@@ -287,7 +289,7 @@ module.exports = React.createClass({
         var connectDragSource = this.props.connectDragSource;
         var connectDropTarget = this.props.connectDropTarget;
 
-        
+
         let ret = (
             <div> { /* Only native elements can be wrapped in a DnD object. */}
             <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>