Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rest of commit adding messagecomposer, and put li's in ul.

Browse Source
This commit is contained in:
David Baker 2015-06-16 10:41:05 +01:00
parent a0c5fb4a8b
commit b2843b09bc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/organisms/RoomView.css
View File

@ -2,10 +2,17 @@
display: table-cell; display: table-cell;
padding-left: 5px; padding-left: 5px;
word-wrap: break-word; word-wrap: break-word;
position: relative;
padding-bottom: 70px
} }
.mx_RoomView ul { .mx_RoomView ul {
padding: 0px; padding: 0px;
margin: 0px;
height: 100%; height: 100%;
overflow-y: scroll; overflow-y: scroll;
} }
.mx_RoomView li {
list-style-type: none;
}

4
src/organisms/RoomView.js
View File

@ -1,6 +1,7 @@
var React = require('react'); var React = require('react');
var MessageTile = require('../molecules/MessageTile'); var MessageTile = require('../molecules/MessageTile');
var RoomHeader = require('../molecules/RoomHeader'); var RoomHeader = require('../molecules/RoomHeader');
var MessageComposer = require('../molecules/MessageComposer');
var MatrixClientPeg = require("../MatrixClientPeg"); var MatrixClientPeg = require("../MatrixClientPeg");
@ -35,7 +36,7 @@ module.exports = React.createClass({
getMessageTiles: function() { getMessageTiles: function() {
return this.state.room.timeline.map(function(mxEv) { return this.state.room.timeline.map(function(mxEv) {
return ( return (
<MessageTile mxEvent={mxEv} key={mxEv.getId()} /> <li><MessageTile mxEvent={mxEv} key={mxEv.getId()} /></li>
); );
}); });
}, },
@ -47,6 +48,7 @@ module.exports = React.createClass({
<ul> <ul>
{this.getMessageTiles()} {this.getMessageTiles()}
</ul> </ul>
<MessageComposer room={this.state.room} />
</div> </div>
); );
}, },