summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoussam Haidar <houssam@sdelements.com>2015-08-28 00:02:49 -0400
committerHoussam Haidar <houssam@sdelements.com>2015-08-28 00:02:49 -0400
commitb74b7f4adb058c175a62bfab3210c6585be50da1 (patch)
treebf2b8df03b55166b100ddf0875231dd865d42bf8
parenta1e80b16db38ab6a9298374c6825baafaffe5360 (diff)
downloadlets-chat-b74b7f4adb058c175a62bfab3210c6585be50da1.zip
lets-chat-b74b7f4adb058c175a62bfab3210c6585be50da1.tar.gz
lets-chat-b74b7f4adb058c175a62bfab3210c6585be50da1.tar.bz2
Proper text chopping for FF
-rw-r--r--media/less/style/chat/rooms.less7
-rw-r--r--templates/includes/js/room.html16
2 files changed, 14 insertions, 9 deletions
diff --git a/media/less/style/chat/rooms.less b/media/less/style/chat/rooms.less
index 398d5f2..7e632e1 100644
--- a/media/less/style/chat/rooms.less
+++ b/media/less/style/chat/rooms.less
@@ -314,8 +314,11 @@
}
@-moz-document url-prefix() {
- .lcb-room-meta {
- width: 0;
+ .lcb-room-meta-text {
+ width: 100%;
+ display: table;
+ table-layout: fixed;
+ .text-overflow;
}
}
diff --git a/templates/includes/js/room.html b/templates/includes/js/room.html
index 9f2c44d..41ac822 100644
--- a/templates/includes/js/room.html
+++ b/templates/includes/js/room.html
@@ -2,13 +2,15 @@
<div class="lcb-room lcb-pane lcb-pane-{{id}} {{#if sidebar}}lcb-room-sidebar-opened{{/if}} hide" data-id="{{id}}">
<header class="lcb-room-header">
<div class="lcb-room-meta">
- <h2 class="lcb-room-heading">
- <span class="slug">#{{slug}}</span>
- {{#if hasPassword}}
- <span class="fa fa-lock btn password" title="<$ __('This room requires password to enter') $>" aria-label="<$ __('This room requires password to enter') $>"></span>
- {{/if}}
- </h2>
- <p class="lcb-room-description">{{description}}</p>
+ <div class="lcb-room-meta-text">
+ <h2 class="lcb-room-heading">
+ <span class="slug">#{{slug}}</span>
+ {{#if hasPassword}}
+ <span class="fa fa-lock btn password" title="<$ __('This room requires password to enter') $>" aria-label="<$ __('This room requires password to enter') $>"></span>
+ {{/if}}
+ </h2>
+ <p class="lcb-room-description">{{description}}</p>
+ </div>
</div>
<div class="lcb-room-header-actions">
<div class="btn-group">