mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into push-rules-settings

Browse source 
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
This commit is contained in:
manuroe 2016-01-18 18:14:20 +01:00
commit fdf5b0a4fc
22 changed files with 388 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/BottomLeftMenu.js
View file

@ -50,7 +50,7 @@ module.exports = React.createClass({
return (
<div className="mx_BottomLeftMenu">
<div className="mx_BottomLeftMenu_options">
<BottomLeftMenuTile collapsed={ this.props.collapsed } img="img/create-big.svg" label="Create new room" onClick={ this.onCreateRoomClick }/>
<BottomLeftMenuTile collapsed={ this.props.collapsed } img="img/create-big.svg" label="Start chat" onClick={ this.onCreateRoomClick }/>
<BottomLeftMenuTile collapsed={ this.props.collapsed } img="img/directory-big.svg" label="Directory" onClick={ this.onRoomDirectoryClick }/>
<BottomLeftMenuTile collapsed={ this.props.collapsed } img="img/settings-big.svg" label="Settings" onClick={ this.onSettingsClick }/>
</div>