From b2843b09bc8e84269b49140bd656d2bc91beec4c Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Jun 2015 10:41:05 +0100 Subject: [PATCH] Rest of commit adding messagecomposer, and put li's in ul. --- css/organisms/RoomView.css | 7 +++++++ src/organisms/RoomView.js | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/css/organisms/RoomView.css b/css/organisms/RoomView.css index d9345f75ec..a7704b959c 100644 --- a/css/organisms/RoomView.css +++ b/css/organisms/RoomView.css @@ -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; +} diff --git a/src/organisms/RoomView.js b/src/organisms/RoomView.js index bc23fc0132..b587b5cafe 100644 --- a/src/organisms/RoomView.js +++ b/src/organisms/RoomView.js @@ -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 ( - +
  • ); }); }, @@ -47,6 +48,7 @@ module.exports = React.createClass({ + ); },