sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "fix problem in chat of usernames hiding first part of message"

Browse source 
This reverts commit 910e4ac0f9e9886a8d3439e197eae3b5c30848ad.
This commit is contained in:
Alice Harris 2014-08-24 17:48:44 +10:00
parent 683f8e1233
commit 3ac9c4f13b
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/css/game-pane.styl
View file

@ -57,6 +57,11 @@
label
margin-right:5px
.float-label
float:left
position:absolute
top:17px;
.hidden-label
visibility:hidden

11
views/options/social/chat-message.jade
View file

@ -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
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)')
|  
span(ng-if='::message.uuid!="system"')
a.label.label-default.chat-message.hidden-label
span {{::message.user}}
|  
markdown(ng-model='::message.text')
| -
span.muted.time(from-now='::message.timestamp')
@ -13,3 +13,6 @@ 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)')