Merge branch 'develop' into luke/feature-app-tile-ux

2017-08-18 12:12:00 +01:00
parent 0adc043884 cab3123bd8
commit 1a1a80b633
27 changed files with 52 additions and 28 deletions
@@ -139,7 +139,7 @@ module.exports = React.createClass({
        }

        return (
-            <div className="mx_RoomView_auxPanel" style={{maxHeight: this.props.maxHeight}} >
+            <div className={ appsDrawer ? "mx_RoomView_auxPanel mx_RoomView_auxPanel_apps" : "mx_RoomView_auxPanel" } style={{maxHeight: this.props.maxHeight}} >
                { appsDrawer }
                { fileDropTarget }
                { callView }