sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

super awesome mega-fix with unintended awesome collateral-fixes

Browse source 
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
This commit is contained in:
Nick Gordon 2013-11-22 10:38:40 -08:00
parent 9075bf0856
commit efe2ff5d70
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,11 @@
.own-message .own-message
border-left: 4px solid #333 border-left: 4px solid #333
padding-left: 2px padding-left: 2px
markdown
p:first-child
display:inline
// Name tags // Name tags
.label-contributor-1, .label-contributor-2 .label-contributor-1, .label-contributor-2

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

@ -2,7 +2,7 @@ li(ng-repeat='message in group.chat', ng-class='{highlight: isUserMentioned(user
a.label.chat-message(class='label-contributor-{{message.contributor.level}}', ng-class='{"label-npc": message.backer.npc}', ng-click='clickMember(message.uuid, true)') a.label.chat-message(class='label-contributor-{{message.contributor.level}}', ng-class='{"label-npc": message.backer.npc}', ng-click='clickMember(message.uuid, true)')
span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}}  span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}} 
|   |  
span(ng-bind-html="message.text | linky:'_blank'") markdown(ng-model='message.text')
|  -  |  - 
span.muted.time(from-now='message.timestamp') span.muted.time(from-now='message.timestamp')
a(ng-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)') a(ng-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)')