summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-27 16:58:44 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-27 17:20:53 +0200
commit7ee5288849dc687515f8ad499e7c95c73f842394 (patch)
tree9581f2199cedb7e286434018639e5bc82862692a
parentAdded generic state/non-state event sending to the API docs. (diff)
downloadsynapse-7ee5288849dc687515f8ad499e7c95c73f842394.tar.xz
Added the recents component at the left hand side of the room page
Diffstat (limited to '')
-rw-r--r--webclient/app.css9
-rw-r--r--webclient/room/room.html6
2 files changed, 14 insertions, 1 deletions
diff --git a/webclient/app.css b/webclient/app.css
index bc23f76f00..e2526dcbaa 100644
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -387,6 +387,15 @@ h1 {
     padding-bottom: 5px;
 }
 
+/*** Recents in the room page ***/
+#roomRecentsTableWrapper {
+    float: left;
+    max-width: 320px;
+    margin-right: 20px;
+    height: 100%;
+    overflow-y: auto;
+}
+
 /*** Profile ***/
 
 .profile-avatar {
diff --git a/webclient/room/room.html b/webclient/room/room.html
index c167819f15..236ca0a89b 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -7,7 +7,11 @@
     <div id="roomName">
         {{ room_alias || room_id }}
     </div>
-    
+
+    <div id="roomRecentsTableWrapper">
+        <div ng-include="'recents/recents.html'"></div>
+    </div>
+
     <div id="usersTableWrapper">
         <table id="usersTable">
             <tr ng-repeat="member in members | orderMembersList">