From 02846c4fff7237609a7787545228d471574ff2ce Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 23 Jul 2015 11:01:28 -0700 Subject: [PATCH] room invite css --- skins/base/css/organisms/RoomView.css | 13 +++++++++++++ skins/base/views/organisms/RoomView.js | 2 ++ 2 files changed, 15 insertions(+) diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css index 253eaa0d7..92cc87ba1 100644 --- a/skins/base/css/organisms/RoomView.css +++ b/skins/base/css/organisms/RoomView.css @@ -94,6 +94,19 @@ limitations under the License. } .mx_RoomView_invitePrompt { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + + min-width: 0px; + max-width: 720px; + width: 100%; + margin: auto; + + margin-top: 12px; + margin-bottom: 12px; } .mx_RoomView_statusArea { diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js index 11ca840df..9bcde890e 100644 --- a/skins/base/views/organisms/RoomView.js +++ b/skins/base/views/organisms/RoomView.js @@ -92,8 +92,10 @@ module.exports = React.createClass({ var joinErrorText = this.state.joinError ? "Failed to join room!" : ""; return (
+
{inviteEvent.user_id} has invited you to a room
+
{joinErrorText}