Merge pull request #4372 from thehindenburg/optoutspace

added space in Jade to the arrow and opt out text in the inbox
This commit is contained in:
Blade Barringer
2014-12-10 15:51:38 -06:00
2 changed files with 3 additions and 0 deletions
+2
View File
@@ -6,6 +6,7 @@ mixin chatMessages(inbox)
span(ng-if='::message.user')
a.label.label-default.chat-message.hidden-label
span.glyphicon.glyphicon-arrow-right(ng-if='::message.sent')
|    
span {{::message.user}} 
span(ng-class='userAdminGlyphiconStyleFromLevel(message.contributor.level)')
// this invisible username label is here to push the message text far enough right that the visible label can be floated to this point without covering up any of the text
@@ -28,5 +29,6 @@ mixin chatMessages(inbox)
span.float-label
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.glyphicon.glyphicon-arrow-right(ng-if='::message.sent')
|  
span(tooltip='{{::contribText(message.contributor, message.backer)}}') {{::message.user}} 
span(ng-class='::userAdminGlyphiconStyleFromLevel(message.contributor.level)')
+1
View File
@@ -16,6 +16,7 @@ script(type='text/ng-template', id='partials/options.social.inbox.html')
.checkbox
label
input(type='checkbox', ng-model='user.inbox.optOut', ng-change='set({"inbox.optOut": user.inbox.optOut?true: false})')
|  
span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('optOutPopover'))=env.t('optOut')
script(type='text/ng-template', id='partials/options.social.tavern.html')