From e8aab2daf181a3acf4fb9ebdb8133c064e335ddb Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Sat, 16 Aug 2014 09:21:39 +1000 Subject: [PATCH] fix problem in chat of usernames hiding first part of message --- public/css/game-pane.styl | 5 ----- views/options/social/chat-message.jade | 11 ++++------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/public/css/game-pane.styl b/public/css/game-pane.styl index d5c927e2ac..ccd0bae89d 100644 --- a/public/css/game-pane.styl +++ b/public/css/game-pane.styl @@ -57,11 +57,6 @@ label margin-right:5px - .float-label - float:left - position:absolute - top:17px; - .hidden-label visibility:hidden diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 3d8fe37494..71aad7b3a5 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -1,9 +1,9 @@ li.chat-message(ng-repeat='message in group.chat', ng-class=':: {highlight: isUserMentioned(user,message) || message.uuid=="system", "own-message": user._id == message.uuid}') .scrollable-message - span(ng-if='::message.uuid!="system"') - a.label.label-default.chat-message.hidden-label - span {{::message.user}} - |   + a.label.label-default.chat-message(ng-if=':: message.user', ng-class='userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)') + span(tooltip='{{::contribText(message.contributor, message.backer)}}') {{::message.user}}  + span(ng-class='userAdminGlyphiconStyleFromLevel(message.contributor.level)') + |   markdown(ng-model='::message.text') | - span.muted.time(from-now='::message.timestamp') @@ -13,6 +13,3 @@ li.chat-message(ng-repeat='message in group.chat', ng-class=':: {highlight: isUs |   a(ng-if=':: user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)') span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) - a.label.label-default.chat-message(ng-if=':: message.user', class='float-label', ng-class='userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)') - span(tooltip='{{::contribText(message.contributor, message.backer)}}') {{::message.user}}  - span(ng-class='userAdminGlyphiconStyleFromLevel(message.contributor.level)')