mirror of https://github.com/vector-im/riot-web
Rest of commit adding messagecomposer, and put li's in ul.
parent
a0c5fb4a8b
commit
b2843b09bc
|
@ -2,10 +2,17 @@
|
|||
display: table-cell;
|
||||
padding-left: 5px;
|
||||
word-wrap: break-word;
|
||||
position: relative;
|
||||
padding-bottom: 70px
|
||||
}
|
||||
|
||||
.mx_RoomView ul {
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
height: 100%;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.mx_RoomView li {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
var React = require('react');
|
||||
var MessageTile = require('../molecules/MessageTile');
|
||||
var RoomHeader = require('../molecules/RoomHeader');
|
||||
var MessageComposer = require('../molecules/MessageComposer');
|
||||
|
||||
var MatrixClientPeg = require("../MatrixClientPeg");
|
||||
|
||||
|
@ -35,7 +36,7 @@ module.exports = React.createClass({
|
|||
getMessageTiles: function() {
|
||||
return this.state.room.timeline.map(function(mxEv) {
|
||||
return (
|
||||
<MessageTile mxEvent={mxEv} key={mxEv.getId()} />
|
||||
<li><MessageTile mxEvent={mxEv} key={mxEv.getId()} /></li>
|
||||
);
|
||||
});
|
||||
},
|
||||
|
@ -47,6 +48,7 @@ module.exports = React.createClass({
|
|||
<ul>
|
||||
{this.getMessageTiles()}
|
||||
</ul>
|
||||
<MessageComposer room={this.state.room} />
|
||||
</div>
|
||||
);
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue