Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix weird shaped message table rows

This commit is contained in:
Matthew Hodgson 2014-11-11 05:02:24 +00:00
parent 5f38625f21
commit 2fdf939ca9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
syweb/webclient/app.css
View File

@ -605,7 +605,7 @@ textarea, input {
} }
.leftBlock { .leftBlock {
width: 6em; width: 7em;
word-wrap: break-word; word-wrap: break-word;
vertical-align: top; vertical-align: top;
background-color: #fff; background-color: #fff;
@ -649,7 +649,7 @@ textarea, input {
.avatar { .avatar {
width: 48px; width: 48px;
text-align: right; text-align: right;
vertical-align: bottom; vertical-align: top;
line-height: 0; line-height: 0;
} }
@ -709,11 +709,9 @@ textarea, input {
max-height: auto; max-height: auto;
} }
/* .differentUser .msg {
.differentUser td { padding-top: 14px ! important;
padding-bottom: 5px ! important;
} }
*/
.mine { .mine {
text-align: right; text-align: right;

4
syweb/webclient/room/room.html
View File

@ -152,7 +152,7 @@
keep-scroll> keep-scroll>
<table id="messageTable" infinite-scroll="paginateMore()"> <table id="messageTable" infinite-scroll="paginateMore()">
<tr ng-repeat="msg in room.events" <tr ng-repeat="msg in room.events"
ng-class="(room.events[$index + 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item> ng-class="(room.events[$index - 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item>
<td class="leftBlock" ng-mouseover="state.showTs = 1" ng-mouseout="state.showTs = 0"> <td class="leftBlock" ng-mouseover="state.showTs = 1" ng-mouseout="state.showTs = 0">
<div class="timestamp" <div class="timestamp"
ng-style="{ 'opacity': state.showTs ? 1.0 : 0.0 }" ng-style="{ 'opacity': state.showTs ? 1.0 : 0.0 }"
@ -166,7 +166,7 @@
<img class="avatarImage" ng-src="{{ msg.__room_member.cnt.avatar_url || msg.__room_member.avatar_url || 'img/default-profile.png' }}" width="32" height="32" title="{{msg.user_id}}" <img class="avatarImage" ng-src="{{ msg.__room_member.cnt.avatar_url || msg.__room_member.avatar_url || 'img/default-profile.png' }}" width="32" height="32" title="{{msg.user_id}}"
ng-hide="room.events[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/> ng-hide="room.events[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/>
</td> </td>
<td style="vertical-align: bottom" 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'"> <td class="msg" 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" ng-dblclick="openJson(msg)"> <div class="bubble" ng-dblclick="openJson(msg)">
<span ng-if="'join' === msg.content.membership && msg.changedKey === 'membership'"> <span ng-if="'join' === msg.content.membership && msg.changedKey === 'membership'">
{{ msg.content.displayname || members[msg.state_key].displayname || msg.state_key }} joined {{ msg.content.displayname || members[msg.state_key].displayname || msg.state_key }} joined