From a2cd942a951d1f8cba4fda1b38ec29171253ab03 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Fri, 12 Sep 2014 16:46:20 +0200 Subject: [PATCH] Fixed public room name and users count alignement Put data into a table to ease layout and manage long strings --- webclient/app.css | 32 ++++++++++++++++++++++---------- webclient/home/home.html | 39 ++++++++++++++++++++++++--------------- 2 files changed, 46 insertions(+), 25 deletions(-) diff --git a/webclient/app.css b/webclient/app.css index 1b918f59e2..a277bd2a59 100755 --- a/webclient/app.css +++ b/webclient/app.css @@ -268,26 +268,38 @@ a:active { color: #000; } font-weight: bold; } -.publicRoomEntry { +.publicTable { max-width: 480px; - margin-bottom: 5px; - border-bottom: 1px #ddd solid; + width: 100%; + 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 { - float: right; + width: 5em; + text-align: right; + font-size: 12px; + color: #888; } .publicRoomTopic { color: #888; font-size: 12px; - padding-right: 5px; - width: 15em; - float: right; - text-align: right; overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + padding-bottom: 5px; + border-bottom: 1px #ddd solid; } #roomName { diff --git a/webclient/home/home.html b/webclient/home/home.html index 023ae1a40c..5a1e18e1de 100644 --- a/webclient/home/home.html +++ b/webclient/home/home.html @@ -24,21 +24,30 @@

Public rooms

-
-
- - {{ room.room_display_name }} - -
- {{ room.num_joined_members }} {{ room.num_joined_members == 1 ? 'user' : 'users' }} -
-
- {{ room.topic }} -
-
-
+ + + + + + + + + + +
+ + {{ room.room_display_name }} + + +
+ {{ room.num_joined_members }} {{ room.num_joined_members == 1 ? 'user' : 'users' }} +
+
+ {{ room.topic }} +