diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 905a4e0a3e..fe66734e9c 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -19,9 +19,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' label.control-label Group Name input.option-content(type='text', ng-model='group.name', placeholder='Group Name') .control-group.option-large - label.control-label Description + label.control-label Description (Markdown OK) textarea.option-content(style='height:15em;', placeholder='Description', ng-model='group.description') - include ../../shared/formatting-help .control-group.option-large label.control-label Logo URL input.option-content(type='url', placeholder='Logo URL', ng-model='group.logo') @@ -87,8 +86,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' .span8 div.blah-options(ng-show='group._editing') .option-large - textarea.option-content(style='height:15em;', placeholder='Message from group leader', ng-model='group.leaderMessage') - include ../../shared/formatting-help + textarea.option-content(style='height:15em;', placeholder='Message from group leader (Markdown OK)', ng-model='group.leaderMessage') table(ng-show='group.leaderMessage') tr td @@ -100,6 +98,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' div(ng-controller='ChatCtrl') h3 Chat include ./chat-box + include ../../shared/formatting-help ul.unstyled.tavern-chat include ./chat-message diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index eded297e3a..b0bb7b9b40 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -104,7 +104,9 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk include ./chat-box - small.alert.alert-info. - Note: if you're reporting a bug, the developers won't see it here. Follow these instructions instead. + small + include ../../shared/formatting-help + alert.alert-info. + Note: if you're reporting a bug, the developers won't see it here. Follow these instructions instead. ul.unstyled.tavern-chat include ./chat-message