From 9819b3619e132d12ec2b6103c4b94de3936d6219 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Fri, 12 Sep 2014 11:56:08 +0200
Subject: [PATCH] CSS m.room.topic and m.room.name events in the history

---
 webclient/room/room.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webclient/room/room.html b/webclient/room/room.html
index 72c8a97ad..9d617eadd 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -72,7 +72,7 @@
                     <img class="avatarImage" ng-src="{{ members[msg.user_id].avatar_url || 'img/default-profile.png' }}" width="32" height="32"
                          ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/>
                 </td>
-                <td ng-class="!msg.content.membership ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'">
+                <td ng-class="(!msg.content.membership && ('m.room.topic' !== msg.type && 'm.room.name' !== msg.type))? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'">
                     <div class="bubble">
                         <span ng-if="'join' === msg.content.membership">
                             {{ members[msg.state_key].displayname || msg.state_key }} joined