tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fixed public room name and users count alignement

Browse source 
Put data into a table to ease layout and manage long strings
This commit is contained in:
Emmanuel ROHEE 2014-09-12 16:46:20 +02:00
parent 09a59ce2d3
commit a2cd942a95
2 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
webclient/app.css
View file

@ -268,26 +268,38 @@ a:active { color: #000; }
font-weight: bold; font-weight: bold;
} }
.publicRoomEntry { .publicTable {
max-width: 480px; max-width: 480px;
margin-bottom: 5px; width: 100%;
border-bottom: 1px #ddd solid; border-collapse: collapse;
}
.publicTable tr {
width: 100%;
}
.publicTable td {
vertical-align: text-top;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.publicRoomEntry {
max-width: 430px;
} }
.publicRoomJoinedUsers { .publicRoomJoinedUsers {
float: right; width: 5em;
text-align: right;
font-size: 12px;
color: #888;
} }
.publicRoomTopic { .publicRoomTopic {
color: #888; color: #888;
font-size: 12px; font-size: 12px;
padding-right: 5px;
width: 15em;
float: right;
text-align: right;
overflow: hidden; overflow: hidden;
white-space: nowrap; padding-bottom: 5px;
text-overflow: ellipsis; border-bottom: 1px #ddd solid;
} }
#roomName { #roomName {

39
webclient/home/home.html
View file

@ -24,21 +24,30 @@
<h3>Public rooms</h3> <h3>Public rooms</h3>
<div class="public_rooms" ng-repeat="room in public_rooms | orderBy:'room_display_name'"> <table class="publicTable">
<div class="publicRoomEntry"> <tbody ng-repeat="room in public_rooms | orderBy:'room_display_name'"
<a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}" class="publicRoomEntry"
ng-class="room.room_display_name.toLowerCase().indexOf('#matrix:') === 0 ? 'roomHighlight' : ''"> ng-class="room.room_display_name.toLowerCase().indexOf('#matrix:') === 0 ? 'roomHighlight' : ''">
{{ room.room_display_name }} <tr>
</a> <td class="publicRoomEntry">
<div ng-class="room.room_display_name.toLowerCase().indexOf('#matrix:') === 0 ? 'publicRoomJoinedUsers roomHighlight' : 'publicRoomJoinedUsers'" <a href="#/room/{{ room.room_alias ? room.room_alias : room.room_id }}" >
ng-show="room.num_joined_members"> {{ room.room_display_name }}
{{ room.num_joined_members }} {{ room.num_joined_members == 1 ? 'user' : 'users' }} </a>
</div> </td>
<div class="publicRoomTopic" ng-show="room.topic"> <td>
{{ room.topic }} <div class="publicRoomJoinedUsers"
</div> ng-show="room.num_joined_members">
</div> {{ room.num_joined_members }} {{ room.num_joined_members == 1 ? 'user' : 'users' }}
</div> </div>
</td>
</tr>
<tr>
<td colspan="2" class="publicRoomTopic">
{{ room.topic }}
</td>
</tr>
</tbody>
</table>
<br/> <br/>
<div> <div>